Mark as const.

2004-11-23  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkuimanager.h (gtk_ui_manager_get_type):
	* gtk/gtktreeview.h (gtk_tree_view_get_type):
	* gtk/gtktreeviewcolumn.h (gtk_tree_view_column_get_type):
	* gtk/gtktreestore.h (gtk_tree_store_get_type):
	* gtk/gtktreeselection.h (gtk_tree_selection_get_type):
	* gtk/gtktreemodelfilter.h (gtk_tree_model_filter_get_type):
	* gtk/gtktreemodel.h (gtk_tree_iter_get_type):
	(gtk_tree_path_get_type):
	(gtk_tree_row_reference_get_type):
	* gtk/gtktoolitem.h (gtk_tool_item_get_type):
	* gtk/gtktoolbutton.h (gtk_tool_button_get_type):
	* gtk/gtktoggleaction.h (gtk_toggle_action_get_type):
	* gtk/gtkthemes.h (gtk_theme_engine_get_type):
	* gtk/gtktextiter.h (gtk_text_iter_get_type):
	* gtk/gtksettings.h (gtk_settings_get_type):
	* gtk/gtkselection.h (gtk_selection_data_get_type):
	* gtk/gtkradioaction.h (gtk_radio_action_get_type):
	* gtk/gtkmenutoolbutton.h (gtk_menu_tool_button_get_type):
	* gtk/gtkliststore.h (gtk_list_store_get_type):
	* gtk/gtkiconview.h (gtk_icon_view_get_type):
	* gtk/gtkicontheme.h (gtk_icon_info_get_type):
	* gtk/gtkiconfactory.h (gtk_icon_factory_get_type):
	(gtk_icon_set_get_type):
	(gtk_icon_source_get_type):
	* gtk/gtkfilesystemwin32.h (gtk_file_system_win32_get_type):
	* gtk/gtkfilesystemunix.h (gtk_file_system_unix_get_type):
	* gtk/gtkfilesystem.h (gtk_file_folder_get_type):
	(gtk_file_info_get_type, gtk_file_path_get_type):
	(gtk_file_system_get_type):
	* gtk/gtkfilefilter.h (gtk_file_filter_get_type):
	* gtk/gtkfilechooserwidget.h (gtk_file_chooser_widget_get_type):
	* gtk/gtkfilechooser.h (gtk_file_chooser_get_type):
	* gtk/gtkfilechooserdialog.h (gtk_file_chooser_dialog_get_type):
	* gtk/gtkexpander.h (gtk_expander_get_type):
	* gtk/gtkentrycompletion.h (gtk_entry_completion_get_type):
	* gtk/gtkcombobox.h (gtk_combo_box_get_type):
	* gtk/gtkcomboboxentry.h (gtk_combo_box_entry_get_type):
	* gtk/gtkclipboard.h (gtk_clipboard_get_type):
	* gtk/gtkcellview.h (gtk_cell_view_get_type):
	* gtk/gtkcellrenderertoggle.h (gtk_cell_renderer_toggle_get_type):
	* gtk/gtkcellrenderertext.h (gtk_cell_renderer_text_get_type):
	* gtk/gtkcellrendererprogress.h (gtk_cell_renderer_progress_get_type):
	* gtk/gtkcellrendererpixbuf.h (gtk_cell_renderer_pixbuf_get_type):
	* gtk/gtkcellrenderercombo.h (gtk_cell_renderer_combo_get_type):
	* gtk/gtkcelllayout.h (gtk_cell_layout_get_type):
	* gtk/gtkactiongroup.h (gtk_action_group_get_type):
	* gtk/gtkaction.h (gtk_action_get_type):
	* gtk/gtkaccessible.h (gtk_accessible_get_type):
	* gtk/gtkaccelmap.h (gtk_accel_map_get_type):
	* gtk/gtkaccelgroup.h (gtk_accel_group_get_type):
	* gtk/gtkmessagedialog.h (gtk_message_dialog_get_type): Mark as const.

	* gtk/gtkicontheme.h:  Don't mark gtk_icon_theme_error_quark()
	as const, to be consistent with all the other error_quark
	functions. (technically they are const, but since these are
	called only in error paths, giving the compiler better
	optimization opportunities doesn't matter much)

	* gtk/gtk.symbols:
	* gdk/gdk.symbols: Add attribute annotations.

	* gtk/makegtkalias.pl:
	* gdk/makegdkalias.pl: Keep attribute annotations, but strip PRIVATE.

	* gtk/Makefile.am (gtk.def):
	* gdk/Makefile.am (gdk.def): Strip attribute annotations, but keep
	PRIVATE.

diff --git a/ChangeLog b/ChangeLog
index 45fadcd6eb11125651d4fa11e594274ba3ab2152..918cba87b4baa1dfae35417ee03990d8a199ee24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,73 @@
+2004-11-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkuimanager.h (gtk_ui_manager_get_type): 
+       * gtk/gtktreeview.h (gtk_tree_view_get_type): 
+       * gtk/gtktreeviewcolumn.h (gtk_tree_view_column_get_type): 
+       * gtk/gtktreestore.h (gtk_tree_store_get_type): 
+       * gtk/gtktreeselection.h (gtk_tree_selection_get_type): 
+       * gtk/gtktreemodelfilter.h (gtk_tree_model_filter_get_type): 
+       * gtk/gtktreemodel.h (gtk_tree_iter_get_type): 
+       (gtk_tree_path_get_type):
+       (gtk_tree_row_reference_get_type):
+       * gtk/gtktoolitem.h (gtk_tool_item_get_type): 
+       * gtk/gtktoolbutton.h (gtk_tool_button_get_type): 
+       * gtk/gtktoggleaction.h (gtk_toggle_action_get_type): 
+       * gtk/gtkthemes.h (gtk_theme_engine_get_type): 
+       * gtk/gtktextiter.h (gtk_text_iter_get_type): 
+       * gtk/gtksettings.h (gtk_settings_get_type): 
+       * gtk/gtkselection.h (gtk_selection_data_get_type): 
+       * gtk/gtkradioaction.h (gtk_radio_action_get_type): 
+       * gtk/gtkmenutoolbutton.h (gtk_menu_tool_button_get_type): 
+       * gtk/gtkliststore.h (gtk_list_store_get_type): 
+       * gtk/gtkiconview.h (gtk_icon_view_get_type): 
+       * gtk/gtkicontheme.h (gtk_icon_info_get_type): 
+       * gtk/gtkiconfactory.h (gtk_icon_factory_get_type): 
+       (gtk_icon_set_get_type):
+       (gtk_icon_source_get_type):
+       * gtk/gtkfilesystemwin32.h (gtk_file_system_win32_get_type): 
+       * gtk/gtkfilesystemunix.h (gtk_file_system_unix_get_type): 
+       * gtk/gtkfilesystem.h (gtk_file_folder_get_type):
+       (gtk_file_info_get_type, gtk_file_path_get_type):
+       (gtk_file_system_get_type):
+       * gtk/gtkfilefilter.h (gtk_file_filter_get_type): 
+       * gtk/gtkfilechooserwidget.h (gtk_file_chooser_widget_get_type): 
+       * gtk/gtkfilechooser.h (gtk_file_chooser_get_type): 
+       * gtk/gtkfilechooserdialog.h (gtk_file_chooser_dialog_get_type): 
+       * gtk/gtkexpander.h (gtk_expander_get_type): 
+       * gtk/gtkentrycompletion.h (gtk_entry_completion_get_type): 
+       * gtk/gtkcombobox.h (gtk_combo_box_get_type): 
+       * gtk/gtkcomboboxentry.h (gtk_combo_box_entry_get_type): 
+       * gtk/gtkclipboard.h (gtk_clipboard_get_type): 
+       * gtk/gtkcellview.h (gtk_cell_view_get_type): 
+       * gtk/gtkcellrenderertoggle.h (gtk_cell_renderer_toggle_get_type): 
+       * gtk/gtkcellrenderertext.h (gtk_cell_renderer_text_get_type): 
+       * gtk/gtkcellrendererprogress.h (gtk_cell_renderer_progress_get_type): 
+       * gtk/gtkcellrendererpixbuf.h (gtk_cell_renderer_pixbuf_get_type): 
+       * gtk/gtkcellrenderercombo.h (gtk_cell_renderer_combo_get_type): 
+       * gtk/gtkcelllayout.h (gtk_cell_layout_get_type):
+       * gtk/gtkactiongroup.h (gtk_action_group_get_type): 
+       * gtk/gtkaction.h (gtk_action_get_type): 
+       * gtk/gtkaccessible.h (gtk_accessible_get_type): 
+       * gtk/gtkaccelmap.h (gtk_accel_map_get_type): 
+       * gtk/gtkaccelgroup.h (gtk_accel_group_get_type): 
+       * gtk/gtkmessagedialog.h (gtk_message_dialog_get_type): Mark as const.  
+
+       * gtk/gtkicontheme.h:  Don't mark gtk_icon_theme_error_quark() 
+       as const, to be consistent with all the other error_quark 
+       functions. (technically they are const, but since these are 
+       called only in error paths, giving the compiler better 
+       optimization opportunities doesn't matter much)
+
+       * gtk/gtk.symbols:
+       * gdk/gdk.symbols: Add attribute annotations.
+
+       * gtk/makegtkalias.pl: 
+       * gdk/makegdkalias.pl: Keep attribute annotations, but strip PRIVATE.
+       
+       * gtk/Makefile.am (gtk.def): 
+       * gdk/Makefile.am (gdk.def): Strip attribute annotations, but keep 
+       PRIVATE.
+
 2004-11-22  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolbar.c (gtk_toolbar_set_icon_size): Add a deprecation

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 45fadcd6eb11125651d4fa11e594274ba3ab2152..918cba87b4baa1dfae35417ee03990d8a199ee24 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,73 @@
+2004-11-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkuimanager.h (gtk_ui_manager_get_type): 
+       * gtk/gtktreeview.h (gtk_tree_view_get_type): 
+       * gtk/gtktreeviewcolumn.h (gtk_tree_view_column_get_type): 
+       * gtk/gtktreestore.h (gtk_tree_store_get_type): 
+       * gtk/gtktreeselection.h (gtk_tree_selection_get_type): 
+       * gtk/gtktreemodelfilter.h (gtk_tree_model_filter_get_type): 
+       * gtk/gtktreemodel.h (gtk_tree_iter_get_type): 
+       (gtk_tree_path_get_type):
+       (gtk_tree_row_reference_get_type):
+       * gtk/gtktoolitem.h (gtk_tool_item_get_type): 
+       * gtk/gtktoolbutton.h (gtk_tool_button_get_type): 
+       * gtk/gtktoggleaction.h (gtk_toggle_action_get_type): 
+       * gtk/gtkthemes.h (gtk_theme_engine_get_type): 
+       * gtk/gtktextiter.h (gtk_text_iter_get_type): 
+       * gtk/gtksettings.h (gtk_settings_get_type): 
+       * gtk/gtkselection.h (gtk_selection_data_get_type): 
+       * gtk/gtkradioaction.h (gtk_radio_action_get_type): 
+       * gtk/gtkmenutoolbutton.h (gtk_menu_tool_button_get_type): 
+       * gtk/gtkliststore.h (gtk_list_store_get_type): 
+       * gtk/gtkiconview.h (gtk_icon_view_get_type): 
+       * gtk/gtkicontheme.h (gtk_icon_info_get_type): 
+       * gtk/gtkiconfactory.h (gtk_icon_factory_get_type): 
+       (gtk_icon_set_get_type):
+       (gtk_icon_source_get_type):
+       * gtk/gtkfilesystemwin32.h (gtk_file_system_win32_get_type): 
+       * gtk/gtkfilesystemunix.h (gtk_file_system_unix_get_type): 
+       * gtk/gtkfilesystem.h (gtk_file_folder_get_type):
+       (gtk_file_info_get_type, gtk_file_path_get_type):
+       (gtk_file_system_get_type):
+       * gtk/gtkfilefilter.h (gtk_file_filter_get_type): 
+       * gtk/gtkfilechooserwidget.h (gtk_file_chooser_widget_get_type): 
+       * gtk/gtkfilechooser.h (gtk_file_chooser_get_type): 
+       * gtk/gtkfilechooserdialog.h (gtk_file_chooser_dialog_get_type): 
+       * gtk/gtkexpander.h (gtk_expander_get_type): 
+       * gtk/gtkentrycompletion.h (gtk_entry_completion_get_type): 
+       * gtk/gtkcombobox.h (gtk_combo_box_get_type): 
+       * gtk/gtkcomboboxentry.h (gtk_combo_box_entry_get_type): 
+       * gtk/gtkclipboard.h (gtk_clipboard_get_type): 
+       * gtk/gtkcellview.h (gtk_cell_view_get_type): 
+       * gtk/gtkcellrenderertoggle.h (gtk_cell_renderer_toggle_get_type): 
+       * gtk/gtkcellrenderertext.h (gtk_cell_renderer_text_get_type): 
+       * gtk/gtkcellrendererprogress.h (gtk_cell_renderer_progress_get_type): 
+       * gtk/gtkcellrendererpixbuf.h (gtk_cell_renderer_pixbuf_get_type): 
+       * gtk/gtkcellrenderercombo.h (gtk_cell_renderer_combo_get_type): 
+       * gtk/gtkcelllayout.h (gtk_cell_layout_get_type):
+       * gtk/gtkactiongroup.h (gtk_action_group_get_type): 
+       * gtk/gtkaction.h (gtk_action_get_type): 
+       * gtk/gtkaccessible.h (gtk_accessible_get_type): 
+       * gtk/gtkaccelmap.h (gtk_accel_map_get_type): 
+       * gtk/gtkaccelgroup.h (gtk_accel_group_get_type): 
+       * gtk/gtkmessagedialog.h (gtk_message_dialog_get_type): Mark as const.  
+
+       * gtk/gtkicontheme.h:  Don't mark gtk_icon_theme_error_quark() 
+       as const, to be consistent with all the other error_quark 
+       functions. (technically they are const, but since these are 
+       called only in error paths, giving the compiler better 
+       optimization opportunities doesn't matter much)
+
+       * gtk/gtk.symbols:
+       * gdk/gdk.symbols: Add attribute annotations.
+
+       * gtk/makegtkalias.pl: 
+       * gdk/makegdkalias.pl: Keep attribute annotations, but strip PRIVATE.
+       
+       * gtk/Makefile.am (gtk.def): 
+       * gdk/Makefile.am (gdk.def): Strip attribute annotations, but keep 
+       PRIVATE.
+
 2004-11-22  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolbar.c (gtk_toolbar_set_icon_size): Add a deprecation

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 45fadcd6eb11125651d4fa11e594274ba3ab2152..918cba87b4baa1dfae35417ee03990d8a199ee24 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,73 @@
+2004-11-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkuimanager.h (gtk_ui_manager_get_type): 
+       * gtk/gtktreeview.h (gtk_tree_view_get_type): 
+       * gtk/gtktreeviewcolumn.h (gtk_tree_view_column_get_type): 
+       * gtk/gtktreestore.h (gtk_tree_store_get_type): 
+       * gtk/gtktreeselection.h (gtk_tree_selection_get_type): 
+       * gtk/gtktreemodelfilter.h (gtk_tree_model_filter_get_type): 
+       * gtk/gtktreemodel.h (gtk_tree_iter_get_type): 
+       (gtk_tree_path_get_type):
+       (gtk_tree_row_reference_get_type):
+       * gtk/gtktoolitem.h (gtk_tool_item_get_type): 
+       * gtk/gtktoolbutton.h (gtk_tool_button_get_type): 
+       * gtk/gtktoggleaction.h (gtk_toggle_action_get_type): 
+       * gtk/gtkthemes.h (gtk_theme_engine_get_type): 
+       * gtk/gtktextiter.h (gtk_text_iter_get_type): 
+       * gtk/gtksettings.h (gtk_settings_get_type): 
+       * gtk/gtkselection.h (gtk_selection_data_get_type): 
+       * gtk/gtkradioaction.h (gtk_radio_action_get_type): 
+       * gtk/gtkmenutoolbutton.h (gtk_menu_tool_button_get_type): 
+       * gtk/gtkliststore.h (gtk_list_store_get_type): 
+       * gtk/gtkiconview.h (gtk_icon_view_get_type): 
+       * gtk/gtkicontheme.h (gtk_icon_info_get_type): 
+       * gtk/gtkiconfactory.h (gtk_icon_factory_get_type): 
+       (gtk_icon_set_get_type):
+       (gtk_icon_source_get_type):
+       * gtk/gtkfilesystemwin32.h (gtk_file_system_win32_get_type): 
+       * gtk/gtkfilesystemunix.h (gtk_file_system_unix_get_type): 
+       * gtk/gtkfilesystem.h (gtk_file_folder_get_type):
+       (gtk_file_info_get_type, gtk_file_path_get_type):
+       (gtk_file_system_get_type):
+       * gtk/gtkfilefilter.h (gtk_file_filter_get_type): 
+       * gtk/gtkfilechooserwidget.h (gtk_file_chooser_widget_get_type): 
+       * gtk/gtkfilechooser.h (gtk_file_chooser_get_type): 
+       * gtk/gtkfilechooserdialog.h (gtk_file_chooser_dialog_get_type): 
+       * gtk/gtkexpander.h (gtk_expander_get_type): 
+       * gtk/gtkentrycompletion.h (gtk_entry_completion_get_type): 
+       * gtk/gtkcombobox.h (gtk_combo_box_get_type): 
+       * gtk/gtkcomboboxentry.h (gtk_combo_box_entry_get_type): 
+       * gtk/gtkclipboard.h (gtk_clipboard_get_type): 
+       * gtk/gtkcellview.h (gtk_cell_view_get_type): 
+       * gtk/gtkcellrenderertoggle.h (gtk_cell_renderer_toggle_get_type): 
+       * gtk/gtkcellrenderertext.h (gtk_cell_renderer_text_get_type): 
+       * gtk/gtkcellrendererprogress.h (gtk_cell_renderer_progress_get_type): 
+       * gtk/gtkcellrendererpixbuf.h (gtk_cell_renderer_pixbuf_get_type): 
+       * gtk/gtkcellrenderercombo.h (gtk_cell_renderer_combo_get_type): 
+       * gtk/gtkcelllayout.h (gtk_cell_layout_get_type):
+       * gtk/gtkactiongroup.h (gtk_action_group_get_type): 
+       * gtk/gtkaction.h (gtk_action_get_type): 
+       * gtk/gtkaccessible.h (gtk_accessible_get_type): 
+       * gtk/gtkaccelmap.h (gtk_accel_map_get_type): 
+       * gtk/gtkaccelgroup.h (gtk_accel_group_get_type): 
+       * gtk/gtkmessagedialog.h (gtk_message_dialog_get_type): Mark as const.  
+
+       * gtk/gtkicontheme.h:  Don't mark gtk_icon_theme_error_quark() 
+       as const, to be consistent with all the other error_quark 
+       functions. (technically they are const, but since these are 
+       called only in error paths, giving the compiler better 
+       optimization opportunities doesn't matter much)
+
+       * gtk/gtk.symbols:
+       * gdk/gdk.symbols: Add attribute annotations.
+
+       * gtk/makegtkalias.pl: 
+       * gdk/makegdkalias.pl: Keep attribute annotations, but strip PRIVATE.
+       
+       * gtk/Makefile.am (gtk.def): 
+       * gdk/Makefile.am (gdk.def): Strip attribute annotations, but keep 
+       PRIVATE.
+
 2004-11-22  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolbar.c (gtk_toolbar_set_icon_size): Add a deprecation

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 45fadcd6eb11125651d4fa11e594274ba3ab2152..918cba87b4baa1dfae35417ee03990d8a199ee24 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,73 @@
+2004-11-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkuimanager.h (gtk_ui_manager_get_type): 
+       * gtk/gtktreeview.h (gtk_tree_view_get_type): 
+       * gtk/gtktreeviewcolumn.h (gtk_tree_view_column_get_type): 
+       * gtk/gtktreestore.h (gtk_tree_store_get_type): 
+       * gtk/gtktreeselection.h (gtk_tree_selection_get_type): 
+       * gtk/gtktreemodelfilter.h (gtk_tree_model_filter_get_type): 
+       * gtk/gtktreemodel.h (gtk_tree_iter_get_type): 
+       (gtk_tree_path_get_type):
+       (gtk_tree_row_reference_get_type):
+       * gtk/gtktoolitem.h (gtk_tool_item_get_type): 
+       * gtk/gtktoolbutton.h (gtk_tool_button_get_type): 
+       * gtk/gtktoggleaction.h (gtk_toggle_action_get_type): 
+       * gtk/gtkthemes.h (gtk_theme_engine_get_type): 
+       * gtk/gtktextiter.h (gtk_text_iter_get_type): 
+       * gtk/gtksettings.h (gtk_settings_get_type): 
+       * gtk/gtkselection.h (gtk_selection_data_get_type): 
+       * gtk/gtkradioaction.h (gtk_radio_action_get_type): 
+       * gtk/gtkmenutoolbutton.h (gtk_menu_tool_button_get_type): 
+       * gtk/gtkliststore.h (gtk_list_store_get_type): 
+       * gtk/gtkiconview.h (gtk_icon_view_get_type): 
+       * gtk/gtkicontheme.h (gtk_icon_info_get_type): 
+       * gtk/gtkiconfactory.h (gtk_icon_factory_get_type): 
+       (gtk_icon_set_get_type):
+       (gtk_icon_source_get_type):
+       * gtk/gtkfilesystemwin32.h (gtk_file_system_win32_get_type): 
+       * gtk/gtkfilesystemunix.h (gtk_file_system_unix_get_type): 
+       * gtk/gtkfilesystem.h (gtk_file_folder_get_type):
+       (gtk_file_info_get_type, gtk_file_path_get_type):
+       (gtk_file_system_get_type):
+       * gtk/gtkfilefilter.h (gtk_file_filter_get_type): 
+       * gtk/gtkfilechooserwidget.h (gtk_file_chooser_widget_get_type): 
+       * gtk/gtkfilechooser.h (gtk_file_chooser_get_type): 
+       * gtk/gtkfilechooserdialog.h (gtk_file_chooser_dialog_get_type): 
+       * gtk/gtkexpander.h (gtk_expander_get_type): 
+       * gtk/gtkentrycompletion.h (gtk_entry_completion_get_type): 
+       * gtk/gtkcombobox.h (gtk_combo_box_get_type): 
+       * gtk/gtkcomboboxentry.h (gtk_combo_box_entry_get_type): 
+       * gtk/gtkclipboard.h (gtk_clipboard_get_type): 
+       * gtk/gtkcellview.h (gtk_cell_view_get_type): 
+       * gtk/gtkcellrenderertoggle.h (gtk_cell_renderer_toggle_get_type): 
+       * gtk/gtkcellrenderertext.h (gtk_cell_renderer_text_get_type): 
+       * gtk/gtkcellrendererprogress.h (gtk_cell_renderer_progress_get_type): 
+       * gtk/gtkcellrendererpixbuf.h (gtk_cell_renderer_pixbuf_get_type): 
+       * gtk/gtkcellrenderercombo.h (gtk_cell_renderer_combo_get_type): 
+       * gtk/gtkcelllayout.h (gtk_cell_layout_get_type):
+       * gtk/gtkactiongroup.h (gtk_action_group_get_type): 
+       * gtk/gtkaction.h (gtk_action_get_type): 
+       * gtk/gtkaccessible.h (gtk_accessible_get_type): 
+       * gtk/gtkaccelmap.h (gtk_accel_map_get_type): 
+       * gtk/gtkaccelgroup.h (gtk_accel_group_get_type): 
+       * gtk/gtkmessagedialog.h (gtk_message_dialog_get_type): Mark as const.  
+
+       * gtk/gtkicontheme.h:  Don't mark gtk_icon_theme_error_quark() 
+       as const, to be consistent with all the other error_quark 
+       functions. (technically they are const, but since these are 
+       called only in error paths, giving the compiler better 
+       optimization opportunities doesn't matter much)
+
+       * gtk/gtk.symbols:
+       * gdk/gdk.symbols: Add attribute annotations.
+
+       * gtk/makegtkalias.pl: 
+       * gdk/makegdkalias.pl: Keep attribute annotations, but strip PRIVATE.
+       
+       * gtk/Makefile.am (gtk.def): 
+       * gdk/Makefile.am (gdk.def): Strip attribute annotations, but keep 
+       PRIVATE.
+
 2004-11-22  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolbar.c (gtk_toolbar_set_icon_size): Add a deprecation

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 684010fca1cf01a1d467a2c4ae6b2e46de590b23..e43ff281e87aec352d82f5ca2d371d9d5124a620 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -177,7 +177,7 @@ uninstall-ms-lib:
 endif
 
 gdk.def: gdk.symbols
-       (echo -e EXPORTS; cpp -P -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES $(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/     /') > gdk.def
+       (echo -e EXPORTS; cpp -P -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES $(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/     /' -e 's/G_GNUC_[^ ]*//g') > gdk.def
 
 gdkalias.h: gdk.symbols
         $(srcdir)/makegdkalias.pl < $(srcdir)/gdk.symbols > gdkalias.h

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index f7fc0135835d9d9d0e3576ea78c661324cc82b1b..eb8b8005a5ea37249c7627ac4e671a0cb452512c 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -26,7 +26,7 @@ gdk_colormap_free_colors
 gdk_colormap_get_screen
 gdk_colormap_get_system
 gdk_colormap_get_system_size
-gdk_colormap_get_type
+gdk_colormap_get_type G_GNUC_CONST
 gdk_colormap_get_visual
 gdk_colormap_new
 gdk_colormap_query_color
@@ -79,7 +79,7 @@ gdk_display_keyboard_ungrab
 gdk_display_list_devices
 gdk_display_manager_get
 gdk_display_manager_get_default_display
-gdk_display_manager_get_type
+gdk_display_manager_get_type G_GNUC_CONST
 gdk_display_manager_list_displays
 gdk_display_manager_set_default_display
 gdk_display_open
@@ -101,7 +101,7 @@ gdk_display_sync
 gdk_drag_abort
 gdk_drag_action_get_type
 gdk_drag_begin
-gdk_drag_context_get_type
+gdk_drag_context_get_type G_GNUC_CONST
 gdk_drag_context_new
 gdk_drag_context_ref
 gdk_drag_context_unref
@@ -210,7 +210,7 @@ gdk_function_get_type
 gdk_gc_copy
 gdk_gc_get_colormap
 gdk_gc_get_screen
-gdk_gc_get_type
+gdk_gc_get_type G_GNUC_CONST
 gdk_gc_get_values
 gdk_gc_new
 gdk_gc_new_with_values
@@ -249,7 +249,7 @@ gdk_gravity_get_type
 gdk_image_get
 gdk_image_get_colormap
 gdk_image_get_pixel
-gdk_image_get_type
+gdk_image_get_type G_GNUC_CONST
 gdk_image_new
 gdk_image_new_bitmap
 gdk_image_put_pixel
@@ -275,17 +275,17 @@ gdk_keymap_get_direction
 gdk_keymap_get_entries_for_keycode
 gdk_keymap_get_entries_for_keyval
 gdk_keymap_get_for_display
-gdk_keymap_get_type
+gdk_keymap_get_type G_GNUC_CONST
 gdk_keymap_lookup_key
 gdk_keymap_translate_keyboard_state
 gdk_keyval_convert_case
 gdk_keyval_from_name
-gdk_keyval_is_lower
-gdk_keyval_is_upper
-gdk_keyval_name
-gdk_keyval_to_lower
-gdk_keyval_to_unicode
-gdk_keyval_to_upper
+gdk_keyval_is_lower G_GNUC_CONST
+gdk_keyval_is_upper G_GNUC_CONST
+gdk_keyval_name G_GNUC_CONST
+gdk_keyval_to_lower G_GNUC_CONST
+gdk_keyval_to_unicode G_GNUC_CONST
+gdk_keyval_to_upper G_GNUC_CONST
 gdk_line_style_get_type
 gdk_list_visuals
 gdk_mbstowcs
@@ -308,7 +308,7 @@ gdk_pango_context_set_colormap
 gdk_pango_layout_get_clip_region
 gdk_pango_layout_line_get_clip_region
 gdk_pango_renderer_get_default
-gdk_pango_renderer_get_type
+gdk_pango_renderer_get_type G_GNUC_CONST
 gdk_pango_renderer_new
 gdk_pango_renderer_set_drawable
 gdk_pango_renderer_set_gc
@@ -329,7 +329,7 @@ gdk_pixmap_create_from_xpm
 gdk_pixmap_create_from_xpm_d
 gdk_pixmap_foreign_new
 gdk_pixmap_foreign_new_for_display
-gdk_pixmap_get_type
+gdk_pixmap_get_type G_GNUC_CONST
 gdk_pixmap_lookup
 gdk_pixmap_lookup_for_display
 gdk_pixmap_new
@@ -381,7 +381,7 @@ gdk_rgb_init
 gdk_rgb_set_install
 gdk_rgb_set_min_colors
 gdk_rgb_set_verbose
-gdk_rgb_xpixel_from_rgb
+gdk_rgb_xpixel_from_rgb G_GNUC_CONST
 gdk_screen_broadcast_client_message
 gdk_screen_get_default
 gdk_screen_get_default_colormap
@@ -403,13 +403,13 @@ gdk_screen_get_toplevel_windows
 gdk_screen_get_type
 gdk_screen_get_width
 gdk_screen_get_width_mm
-gdk_screen_height
-gdk_screen_height_mm
+gdk_screen_height G_GNUC_CONST
+gdk_screen_height_mm G_GNUC_CONST
 gdk_screen_list_visuals
 gdk_screen_make_display_name
 gdk_screen_set_default_colormap
-gdk_screen_width
-gdk_screen_width_mm
+gdk_screen_width G_GNUC_CONST
+gdk_screen_width_mm G_GNUC_CONST
 gdk_scroll_direction_get_type
 gdk_selection_convert
 gdk_selection_owner_get
@@ -459,7 +459,7 @@ gdk_threads_lock
 gdk_threads_unlock
 #endif
 gdk_threads_set_lock_functions
-gdk_unicode_to_keyval
+gdk_unicode_to_keyval G_GNUC_CONST
 gdk_utf8_to_compound_text
 gdk_utf8_to_compound_text_for_display
 gdk_utf8_to_string_target
@@ -543,7 +543,7 @@ gdk_window_merge_child_shapes
 gdk_window_move
 gdk_window_move_resize
 gdk_window_new
-gdk_window_object_get_type
+gdk_window_object_get_type G_GNUC_CONST
 gdk_window_peek_children
 gdk_window_process_all_updates
 gdk_window_process_updates

diff --git a/gdk/makegdkalias.pl b/gdk/makegdkalias.pl
index 231ac8f901fb3e7b0217443e26e12c77700659da..3b745e178011a882c55dc226835bb4b4f229a061 100755 (executable)
--- a/gdk/makegdkalias.pl
+++ b/gdk/makegdkalias.pl
@@ -97,12 +97,23 @@ while (<>) {
       next;
   }
 
+  chop;
   my $str = $_;
+  my @words;
+  my $attributes = "";
+
+  @words = split(/ /, $str);
+  $str = shift(@words);
   chomp($str);
   my $alias = "IA__".$str;
- 
+  
+  # Drop any Win32 specific .def file syntax,  but keep attributes
+  foreach $word (@words) {
+      $attributes = "$attributes $word" unless $word eq "PRIVATE";
+  }
+      
   print <<EOF
-extern __typeof ($str) $alias __attribute((visibility("hidden")));
+extern __typeof ($str) $alias __attribute((visibility("hidden")))$attributes;
 extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
 \#define $str $alias
 

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index f49d98b430820c1a1d4200db7f8544bd03534ea0..8f088336cbad0ca643a8c864c7f5a6110de2c320 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -71,7 +71,7 @@ uninstall-ms-lib:
 endif
 
 gtk.def: gtk.symbols
-       (echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES -DG_OS_WIN32 $(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/      /') > gtk.def
+       (echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES -DG_OS_WIN32 $(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/      /' -e 's/G_GNUC_[^ ]*//g') > gtk.def
 
 gtkalias.h: gtk.symbols
          $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 7e58a14f547577a68b8b7056bb181212ab6a7006..9c9fd3d3ea8cf9bad98c66cc23deac28b8c02118 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -17,7 +17,7 @@ gtk_about_dialog_get_logo
 gtk_about_dialog_get_logo_icon_name
 gtk_about_dialog_get_name
 gtk_about_dialog_get_translator_credits
-gtk_about_dialog_get_type
+gtk_about_dialog_get_type G_GNUC_CONST
 gtk_about_dialog_get_version
 gtk_about_dialog_get_website
 gtk_about_dialog_get_website_label
@@ -42,7 +42,7 @@ gtk_accelerator_get_label
 gtk_accelerator_name
 gtk_accelerator_parse
 gtk_accelerator_set_default_mod_mask
-gtk_accelerator_valid
+gtk_accelerator_valid G_GNUC_CONST
 gtk_accel_flags_get_type
 gtk_accel_group_activate
 gtk_accel_group_connect
@@ -51,7 +51,7 @@ gtk_accel_group_disconnect
 gtk_accel_group_disconnect_key
 gtk_accel_group_find
 gtk_accel_group_from_accel_closure
-gtk_accel_group_get_type
+gtk_accel_group_get_type G_GNUC_CONST
 gtk_accel_group_lock
 gtk_accel_group_new
 gtk_accel_group_query
@@ -60,7 +60,7 @@ gtk_accel_groups_from_object
 gtk_accel_group_unlock
 gtk_accel_label_get_accel_widget
 gtk_accel_label_get_accel_width
-gtk_accel_label_get_type
+gtk_accel_label_get_type G_GNUC_CONST
 gtk_accel_label_new
 gtk_accel_label_refetch
 gtk_accel_label_set_accel_closure
@@ -71,7 +71,7 @@ gtk_accel_map_change_entry
 gtk_accel_map_foreach
 gtk_accel_map_foreach_unfiltered
 gtk_accel_map_get
-gtk_accel_map_get_type
+gtk_accel_map_get_type G_GNUC_CONST
 gtk_accel_map_load
 gtk_accel_map_load_fd
 gtk_accel_map_load_scanner
@@ -81,7 +81,7 @@ gtk_accel_map_save
 gtk_accel_map_save_fd
 gtk_accel_map_unlock_path
 gtk_accessible_connect_widget_destroyed
-gtk_accessible_get_type
+gtk_accessible_get_type G_GNUC_CONST
 gtk_action_activate
 gtk_action_block_activate_from
 gtk_action_connect_accelerator
@@ -95,7 +95,7 @@ gtk_action_get_accel_path
 gtk_action_get_name
 gtk_action_get_proxies
 gtk_action_get_sensitive
-gtk_action_get_type
+gtk_action_get_type G_GNUC_CONST
 gtk_action_get_visible
 gtk_action_group_add_action
 gtk_action_group_add_actions
@@ -108,7 +108,7 @@ gtk_action_group_add_toggle_actions_full
 gtk_action_group_get_action
 gtk_action_group_get_name
 gtk_action_group_get_sensitive
-gtk_action_group_get_type
+gtk_action_group_get_type G_GNUC_CONST
 gtk_action_group_get_visible
 gtk_action_group_list_actions
 gtk_action_group_new
@@ -128,24 +128,24 @@ gtk_action_set_visible
 gtk_action_unblock_activate_from
 gtk_adjustment_changed
 gtk_adjustment_clamp_page
-gtk_adjustment_get_type
+gtk_adjustment_get_type G_GNUC_CONST
 gtk_adjustment_get_value
 gtk_adjustment_new
 gtk_adjustment_set_value
 gtk_adjustment_value_changed
 gtk_alignment_get_padding
-gtk_alignment_get_type
+gtk_alignment_get_type G_GNUC_CONST
 gtk_alignment_new
 gtk_alignment_set
 gtk_alignment_set_padding
 gtk_alternative_dialog_button_order
 gtk_anchor_type_get_type
 gtk_arg_flags_get_type
-gtk_arrow_get_type
+gtk_arrow_get_type G_GNUC_CONST
 gtk_arrow_new
 gtk_arrow_set
 gtk_arrow_type_get_type
-gtk_aspect_frame_get_type
+gtk_aspect_frame_get_type G_GNUC_CONST
 gtk_aspect_frame_new
 gtk_aspect_frame_set
 gtk_attach_options_get_type
@@ -165,13 +165,13 @@ gtk_binding_set_by_class
 gtk_binding_set_find
 gtk_binding_set_new
 gtk_bin_get_child
-gtk_bin_get_type
+gtk_bin_get_type G_GNUC_CONST
 gtk_border_copy
 gtk_border_free
 gtk_border_get_type
 gtk_box_get_homogeneous
 gtk_box_get_spacing
-gtk_box_get_type
+gtk_box_get_type G_GNUC_CONST
 gtk_box_pack_end
 gtk_box_pack_end_defaults
 gtk_box_pack_start
@@ -186,7 +186,7 @@ gtk_button_box_get_child_ipadding
 gtk_button_box_get_child_secondary
 gtk_button_box_get_child_size
 gtk_button_box_get_layout
-gtk_button_box_get_type
+gtk_button_box_get_type G_GNUC_CONST
 gtk_button_box_set_child_ipadding
 gtk_button_box_set_child_secondary
 gtk_button_box_set_child_size
@@ -199,7 +199,7 @@ gtk_button_get_focus_on_click
 gtk_button_get_image
 gtk_button_get_label
 gtk_button_get_relief
-gtk_button_get_type
+gtk_button_get_type G_GNUC_CONST
 gtk_button_get_use_stock
 gtk_button_get_use_underline
 gtk_button_leave
@@ -223,7 +223,7 @@ gtk_calendar_display_options_get_type
 gtk_calendar_freeze
 gtk_calendar_get_date
 gtk_calendar_get_display_options
-gtk_calendar_get_type
+gtk_calendar_get_type G_GNUC_CONST
 gtk_calendar_mark_day
 gtk_calendar_new
 gtk_calendar_select_day
@@ -232,40 +232,40 @@ gtk_calendar_set_display_options
 gtk_calendar_thaw
 gtk_calendar_unmark_day
 gtk_cell_editable_editing_done
-gtk_cell_editable_get_type
+gtk_cell_editable_get_type G_GNUC_CONST
 gtk_cell_editable_remove_widget
 gtk_cell_editable_start_editing
 gtk_cell_layout_add_attribute
 gtk_cell_layout_clear
 gtk_cell_layout_clear_attributes
-gtk_cell_layout_get_type
+gtk_cell_layout_get_type G_GNUC_CONST
 gtk_cell_layout_pack_end
 gtk_cell_layout_pack_start
 gtk_cell_layout_reorder
 gtk_cell_layout_set_attributes
 gtk_cell_layout_set_cell_data_func
 gtk_cell_renderer_activate
-gtk_cell_renderer_combo_get_type
+gtk_cell_renderer_combo_get_type G_GNUC_CONST
 gtk_cell_renderer_combo_new
 gtk_cell_renderer_editing_canceled
 gtk_cell_renderer_get_fixed_size
 gtk_cell_renderer_get_size
-gtk_cell_renderer_get_type
+gtk_cell_renderer_get_type G_GNUC_CONST
 gtk_cell_renderer_mode_get_type
-gtk_cell_renderer_pixbuf_get_type
+gtk_cell_renderer_pixbuf_get_type G_GNUC_CONST
 gtk_cell_renderer_pixbuf_new
-gtk_cell_renderer_progress_get_type
+gtk_cell_renderer_progress_get_type G_GNUC_CONST
 gtk_cell_renderer_progress_new
 gtk_cell_renderer_render
 gtk_cell_renderer_set_fixed_size
 gtk_cell_renderer_start_editing
 gtk_cell_renderer_state_get_type
-gtk_cell_renderer_text_get_type
+gtk_cell_renderer_text_get_type G_GNUC_CONST
 gtk_cell_renderer_text_new
 gtk_cell_renderer_text_set_fixed_height_from_font
 gtk_cell_renderer_toggle_get_active
 gtk_cell_renderer_toggle_get_radio
-gtk_cell_renderer_toggle_get_type
+gtk_cell_renderer_toggle_get_type G_GNUC_CONST
 gtk_cell_renderer_toggle_new
 gtk_cell_renderer_toggle_set_active
 gtk_cell_renderer_toggle_set_radio
@@ -273,7 +273,7 @@ gtk_cell_type_get_type
 gtk_cell_view_get_cell_renderers
 gtk_cell_view_get_displayed_row
 gtk_cell_view_get_size_of_row
-gtk_cell_view_get_type
+gtk_cell_view_get_type G_GNUC_CONST
 gtk_cell_view_new
 gtk_cell_view_new_with_markup
 gtk_cell_view_new_with_pixbuf
@@ -284,14 +284,14 @@ gtk_cell_view_set_displayed_row
 gtk_cell_view_set_model
 gtk_cell_view_set_value
 gtk_cell_view_set_values
-gtk_check_button_get_type
+gtk_check_button_get_type G_GNUC_CONST
 gtk_check_button_new
 gtk_check_button_new_with_label
 gtk_check_button_new_with_mnemonic
 gtk_check_menu_item_get_active
 gtk_check_menu_item_get_draw_as_radio
 gtk_check_menu_item_get_inconsistent
-gtk_check_menu_item_get_type
+gtk_check_menu_item_get_type G_GNUC_CONST
 gtk_check_menu_item_new
 gtk_check_menu_item_new_with_label
 gtk_check_menu_item_new_with_mnemonic
@@ -306,7 +306,7 @@ gtk_clipboard_get
 gtk_clipboard_get_display
 gtk_clipboard_get_for_display
 gtk_clipboard_get_owner
-gtk_clipboard_get_type
+gtk_clipboard_get_type G_GNUC_CONST
 gtk_clipboard_request_contents
 gtk_clipboard_request_image
 gtk_clipboard_request_targets
@@ -348,7 +348,7 @@ gtk_clist_get_row_style
 gtk_clist_get_selectable
 gtk_clist_get_selection_info
 gtk_clist_get_text
-gtk_clist_get_type
+gtk_clist_get_type G_GNUC_CONST
 gtk_clist_get_vadjustment
 gtk_clist_insert
 gtk_clist_moveto
@@ -402,7 +402,7 @@ gtk_clist_unselect_row
 gtk_color_button_get_alpha
 gtk_color_button_get_color
 gtk_color_button_get_title
-gtk_color_button_get_type
+gtk_color_button_get_type G_GNUC_CONST
 gtk_color_button_get_use_alpha
 gtk_color_button_new
 gtk_color_button_new_with_color
@@ -410,7 +410,7 @@ gtk_color_button_set_alpha
 gtk_color_button_set_color
 gtk_color_button_set_title
 gtk_color_button_set_use_alpha
-gtk_color_selection_dialog_get_type
+gtk_color_selection_dialog_get_type G_GNUC_CONST
 gtk_color_selection_dialog_new
 gtk_color_selection_get_color
 gtk_color_selection_get_current_alpha
@@ -419,7 +419,7 @@ gtk_color_selection_get_has_opacity_control
 gtk_color_selection_get_has_palette
 gtk_color_selection_get_previous_alpha
 gtk_color_selection_get_previous_color
-gtk_color_selection_get_type
+gtk_color_selection_get_type G_GNUC_CONST
 gtk_color_selection_is_adjusting
 gtk_color_selection_new
 gtk_color_selection_palette_from_string
@@ -436,7 +436,7 @@ gtk_color_selection_set_previous_color
 gtk_color_selection_set_update_policy
 gtk_combo_box_append_text
 gtk_combo_box_entry_get_text_column
-gtk_combo_box_entry_get_type
+gtk_combo_box_entry_get_type G_GNUC_CONST
 gtk_combo_box_entry_new
 gtk_combo_box_entry_new_text
 gtk_combo_box_entry_new_with_model
@@ -451,7 +451,7 @@ gtk_combo_box_get_model
 gtk_combo_box_get_popup_accessible
 gtk_combo_box_get_row_separator_func
 gtk_combo_box_get_row_span_column
-gtk_combo_box_get_type
+gtk_combo_box_get_type G_GNUC_CONST
 gtk_combo_box_get_wrap_width
 gtk_combo_box_insert_text
 gtk_combo_box_new
@@ -471,7 +471,7 @@ gtk_combo_box_set_row_separator_func
 gtk_combo_box_set_row_span_column
 gtk_combo_box_set_wrap_width
 gtk_combo_disable_activate
-gtk_combo_get_type
+gtk_combo_get_type G_GNUC_CONST
 gtk_combo_new
 gtk_combo_set_case_sensitive
 gtk_combo_set_item_string
@@ -504,7 +504,7 @@ gtk_container_get_focus_chain
 gtk_container_get_focus_hadjustment
 gtk_container_get_focus_vadjustment
 gtk_container_get_resize_mode
-gtk_container_get_type
+gtk_container_get_type G_GNUC_CONST
 gtk_container_propagate_expose
 gtk_container_remove
 gtk_container_resize_children
@@ -533,7 +533,7 @@ gtk_ctree_find_by_row_data
 gtk_ctree_find_by_row_data_custom
 gtk_ctree_find_node_ptr
 gtk_ctree_get_node_info
-gtk_ctree_get_type
+gtk_ctree_get_type G_GNUC_CONST
 gtk_ctree_insert_gnode
 gtk_ctree_insert_node
 gtk_ctree_is_ancestor
@@ -552,7 +552,7 @@ gtk_ctree_node_get_row_data
 gtk_ctree_node_get_row_style
 gtk_ctree_node_get_selectable
 gtk_ctree_node_get_text
-gtk_ctree_node_get_type
+gtk_ctree_node_get_type G_GNUC_CONST
 gtk_ctree_node_is_visible
 gtk_ctree_node_moveto
 gtk_ctree_node_nth
@@ -589,7 +589,7 @@ gtk_ctree_toggle_expansion
 gtk_ctree_toggle_expansion_recursive
 gtk_ctree_unselect
 gtk_ctree_unselect_recursive
-gtk_curve_get_type
+gtk_curve_get_type G_GNUC_CONST
 gtk_curve_get_vector
 gtk_curve_new
 gtk_curve_reset
@@ -613,7 +613,7 @@ gtk_dialog_add_button
 gtk_dialog_add_buttons
 gtk_dialog_flags_get_type
 gtk_dialog_get_has_separator
-gtk_dialog_get_type
+gtk_dialog_get_type G_GNUC_CONST
 gtk_dialog_new
 gtk_dialog_new_with_buttons
 gtk_dialog_response
@@ -668,7 +668,7 @@ gtk_draw_flat_box
 gtk_draw_focus
 gtk_draw_handle
 gtk_draw_hline
-gtk_drawing_area_get_type
+gtk_drawing_area_get_type G_GNUC_CONST
 gtk_drawing_area_new
 gtk_drawing_area_size
 gtk_draw_insertion_cursor
@@ -690,7 +690,7 @@ gtk_editable_get_chars
 gtk_editable_get_editable
 gtk_editable_get_position
 gtk_editable_get_selection_bounds
-gtk_editable_get_type
+gtk_editable_get_type G_GNUC_CONST
 gtk_editable_insert_text
 gtk_editable_paste_clipboard
 gtk_editable_select_region
@@ -705,7 +705,7 @@ gtk_entry_completion_get_minimum_key_length
 gtk_entry_completion_get_model
 gtk_entry_completion_get_popup_completion
 gtk_entry_completion_get_text_column
-gtk_entry_completion_get_type
+gtk_entry_completion_get_type G_GNUC_CONST
 gtk_entry_completion_insert_action_markup
 gtk_entry_completion_insert_action_text
 gtk_entry_completion_insert_prefix
@@ -725,7 +725,7 @@ gtk_entry_get_layout
 gtk_entry_get_layout_offsets
 gtk_entry_get_max_length
 gtk_entry_get_text
-gtk_entry_get_type
+gtk_entry_get_type G_GNUC_CONST
 gtk_entry_get_visibility
 gtk_entry_get_width_chars
 gtk_entry_layout_index_to_text_index
@@ -746,7 +746,7 @@ gtk_entry_set_visibility
 gtk_entry_set_width_chars
 gtk_entry_text_index_to_layout_index
 gtk_event_box_get_above_child
-gtk_event_box_get_type
+gtk_event_box_get_type G_GNUC_CONST
 gtk_event_box_get_visible_window
 gtk_event_box_new
 gtk_event_box_set_above_child
@@ -757,7 +757,7 @@ gtk_expander_get_expanded
 gtk_expander_get_label
 gtk_expander_get_label_widget
 gtk_expander_get_spacing
-gtk_expander_get_type
+gtk_expander_get_type G_GNUC_CONST
 gtk_expander_get_use_markup
 gtk_expander_get_use_underline
 gtk_expander_new
@@ -769,14 +769,14 @@ gtk_expander_set_spacing
 gtk_expander_set_use_markup
 gtk_expander_set_use_underline
 gtk_expander_style_get_type
-gtk_false
+gtk_false G_GNUC_CONST
 gtk_file_chooser_action_get_type
 gtk_file_chooser_add_filter
 gtk_file_chooser_add_shortcut_folder
 gtk_file_chooser_add_shortcut_folder_uri
 gtk_file_chooser_button_get_active
 gtk_file_chooser_button_get_title
-gtk_file_chooser_button_get_type
+gtk_file_chooser_button_get_type G_GNUC_CONST
 gtk_file_chooser_button_get_width_chars
 gtk_file_chooser_button_new
 gtk_file_chooser_button_new_with_backend
@@ -784,7 +784,7 @@ gtk_file_chooser_button_new_with_dialog
 gtk_file_chooser_button_set_active
 gtk_file_chooser_button_set_title
 gtk_file_chooser_button_set_width_chars
-gtk_file_chooser_dialog_get_type
+gtk_file_chooser_dialog_get_type G_GNUC_CONST
 gtk_file_chooser_dialog_new
 gtk_file_chooser_dialog_new_with_backend
 gtk_file_chooser_error_get_type
@@ -803,7 +803,7 @@ gtk_file_chooser_get_preview_widget
 gtk_file_chooser_get_preview_widget_active
 gtk_file_chooser_get_select_multiple
 gtk_file_chooser_get_show_hidden
-gtk_file_chooser_get_type
+gtk_file_chooser_get_type G_GNUC_CONST
 gtk_file_chooser_get_uri
 gtk_file_chooser_get_uris
 gtk_file_chooser_get_use_preview_label
@@ -833,7 +833,7 @@ gtk_file_chooser_set_use_preview_label
 gtk_file_chooser_unselect_all
 gtk_file_chooser_unselect_filename
 gtk_file_chooser_unselect_uri
-gtk_file_chooser_widget_get_type
+gtk_file_chooser_widget_get_type G_GNUC_CONST
 gtk_file_chooser_widget_new
 gtk_file_chooser_widget_new_with_backend
 gtk_file_filter_add_custom
@@ -844,11 +844,11 @@ gtk_file_filter_filter
 gtk_file_filter_flags_get_type
 gtk_file_filter_get_name
 gtk_file_filter_get_needed
-gtk_file_filter_get_type
+gtk_file_filter_get_type G_GNUC_CONST
 gtk_file_filter_new
 gtk_file_filter_set_name
 gtk_file_folder_get_info
-gtk_file_folder_get_type
+gtk_file_folder_get_type G_GNUC_CONST
 gtk_file_folder_is_finished_loading
 gtk_file_folder_list_children
 gtk_file_info_copy
@@ -860,7 +860,7 @@ gtk_file_info_get_is_hidden
 gtk_file_info_get_mime_type
 gtk_file_info_get_modification_time
 gtk_file_info_get_size
-gtk_file_info_get_type
+gtk_file_info_get_type G_GNUC_CONST
 gtk_file_info_new
 gtk_file_info_set_display_name
 gtk_file_info_set_is_folder
@@ -868,7 +868,7 @@ gtk_file_info_set_is_hidden
 gtk_file_info_set_mime_type
 gtk_file_info_set_modification_time
 gtk_file_info_set_size
-gtk_file_path_get_type
+gtk_file_path_get_type G_GNUC_CONST
 gtk_file_paths_copy
 gtk_file_paths_free
 gtk_file_paths_sort
@@ -876,7 +876,7 @@ gtk_file_selection_complete
 gtk_file_selection_get_filename
 gtk_file_selection_get_selections
 gtk_file_selection_get_select_multiple
-gtk_file_selection_get_type
+gtk_file_selection_get_type G_GNUC_CONST
 gtk_file_selection_hide_fileop_buttons
 gtk_file_selection_new
 gtk_file_selection_set_filename
@@ -887,7 +887,7 @@ gtk_file_system_error_quark
 gtk_file_system_filename_to_path
 gtk_file_system_get_folder
 gtk_file_system_get_parent
-gtk_file_system_get_type
+gtk_file_system_get_type G_GNUC_CONST
 gtk_file_system_get_volume_for_path
 gtk_file_system_insert_bookmark
 gtk_file_system_list_bookmarks
@@ -900,7 +900,7 @@ gtk_file_system_path_to_uri
 gtk_file_system_remove_bookmark
 gtk_file_system_render_icon
 #ifdef G_OS_UNIX
-gtk_file_system_unix_get_type
+gtk_file_system_unix_get_type G_GNUC_CONST
 gtk_file_system_unix_new
 #endif
 gtk_file_system_uri_to_path
@@ -911,11 +911,11 @@ gtk_file_system_volume_get_is_mounted
 gtk_file_system_volume_mount
 gtk_file_system_volume_render_icon
 #ifdef G_OS_WIN32
-gtk_file_system_win32_get_type
+gtk_file_system_win32_get_type G_GNUC_CONST
 gtk_file_system_win32_new
 #endif
 gtk_fixed_get_has_window
-gtk_fixed_get_type
+gtk_fixed_get_type G_GNUC_CONST
 gtk_fixed_move
 gtk_fixed_new
 gtk_fixed_put
@@ -924,7 +924,7 @@ gtk_font_button_get_font_name
 gtk_font_button_get_show_size
 gtk_font_button_get_show_style
 gtk_font_button_get_title
-gtk_font_button_get_type
+gtk_font_button_get_type G_GNUC_CONST
 gtk_font_button_get_use_font
 gtk_font_button_get_use_size
 gtk_font_button_new
@@ -938,14 +938,14 @@ gtk_font_button_set_use_size
 gtk_font_selection_dialog_get_font
 gtk_font_selection_dialog_get_font_name
 gtk_font_selection_dialog_get_preview_text
-gtk_font_selection_dialog_get_type
+gtk_font_selection_dialog_get_type G_GNUC_CONST
 gtk_font_selection_dialog_new
 gtk_font_selection_dialog_set_font_name
 gtk_font_selection_dialog_set_preview_text
 gtk_font_selection_get_font
 gtk_font_selection_get_font_name
 gtk_font_selection_get_preview_text
-gtk_font_selection_get_type
+gtk_font_selection_get_type G_GNUC_CONST
 gtk_font_selection_new
 gtk_font_selection_set_font_name
 gtk_font_selection_set_preview_text
@@ -953,13 +953,13 @@ gtk_frame_get_label
 gtk_frame_get_label_align
 gtk_frame_get_label_widget
 gtk_frame_get_shadow_type
-gtk_frame_get_type
+gtk_frame_get_type G_GNUC_CONST
 gtk_frame_new
 gtk_frame_set_label
 gtk_frame_set_label_align
 gtk_frame_set_label_widget
 gtk_frame_set_shadow_type
-gtk_gamma_curve_get_type
+gtk_gamma_curve_get_type G_GNUC_CONST
 gtk_gamma_curve_new
 gtk_gc_get
 gtk_gc_release
@@ -975,33 +975,33 @@ gtk_grab_remove
 gtk_handle_box_get_handle_position
 gtk_handle_box_get_shadow_type
 gtk_handle_box_get_snap_edge
-gtk_handle_box_get_type
+gtk_handle_box_get_type G_GNUC_CONST
 gtk_handle_box_new
 gtk_handle_box_set_handle_position
 gtk_handle_box_set_shadow_type
 gtk_handle_box_set_snap_edge
-gtk_hbox_get_type
+gtk_hbox_get_type G_GNUC_CONST
 gtk_hbox_new
 gtk_hbutton_box_get_layout_default
 gtk_hbutton_box_get_spacing_default
-gtk_hbutton_box_get_type
+gtk_hbutton_box_get_type G_GNUC_CONST
 gtk_hbutton_box_new
 gtk_hbutton_box_set_layout_default
 gtk_hbutton_box_set_spacing_default
-gtk_hpaned_get_type
+gtk_hpaned_get_type G_GNUC_CONST
 gtk_hpaned_new
-gtk_hruler_get_type
+gtk_hruler_get_type G_GNUC_CONST
 gtk_hruler_new
-gtk_hscale_get_type
+gtk_hscale_get_type G_GNUC_CONST
 gtk_hscale_new
 gtk_hscale_new_with_range
-gtk_hscrollbar_get_type
+gtk_hscrollbar_get_type G_GNUC_CONST
 gtk_hscrollbar_new
-gtk_hseparator_get_type
+gtk_hseparator_get_type G_GNUC_CONST
 gtk_hseparator_new
 gtk_hsv_get_color
 gtk_hsv_get_metrics
-gtk_hsv_get_type
+gtk_hsv_get_type G_GNUC_CONST
 gtk_hsv_is_adjusting
 gtk_hsv_new
 gtk_hsv_set_color
@@ -1009,7 +1009,7 @@ gtk_hsv_set_metrics
 gtk_hsv_to_rgb
 gtk_icon_factory_add
 gtk_icon_factory_add_default
-gtk_icon_factory_get_type
+gtk_icon_factory_get_type G_GNUC_CONST
 gtk_icon_factory_lookup
 gtk_icon_factory_lookup_default
 gtk_icon_factory_new
@@ -1029,7 +1029,7 @@ gtk_icon_lookup_flags_get_type
 gtk_icon_set_add_source
 gtk_icon_set_copy
 gtk_icon_set_get_sizes
-gtk_icon_set_get_type
+gtk_icon_set_get_type G_GNUC_CONST
 gtk_icon_set_new
 gtk_icon_set_new_from_pixbuf
 gtk_icon_set_ref
@@ -1053,7 +1053,7 @@ gtk_icon_source_get_size
 gtk_icon_source_get_size_wildcarded
 gtk_icon_source_get_state
 gtk_icon_source_get_state_wildcarded
-gtk_icon_source_get_type
+gtk_icon_source_get_type G_GNUC_CONST
 gtk_icon_source_new
 gtk_icon_source_set_direction
 gtk_icon_source_set_direction_wildcarded
@@ -1073,7 +1073,7 @@ gtk_icon_theme_get_example_icon_name
 gtk_icon_theme_get_for_screen
 gtk_icon_theme_get_icon_sizes
 gtk_icon_theme_get_search_path
-gtk_icon_theme_get_type
+gtk_icon_theme_get_type G_GNUC_CONST
 gtk_icon_theme_has_icon
 gtk_icon_theme_list_icons
 gtk_icon_theme_load_icon
@@ -1124,9 +1124,9 @@ gtk_image_get_pixel_size
 gtk_image_get_pixmap
 gtk_image_get_stock
 gtk_image_get_storage_type
-gtk_image_get_type
+gtk_image_get_type G_GNUC_CONST
 gtk_image_menu_item_get_image
-gtk_image_menu_item_get_type
+gtk_image_menu_item_get_type G_GNUC_CONST
 gtk_image_menu_item_new
 gtk_image_menu_item_new_from_stock
 gtk_image_menu_item_new_with_label
@@ -1158,17 +1158,17 @@ gtk_im_context_focus_in
 gtk_im_context_focus_out
 gtk_im_context_get_preedit_string
 gtk_im_context_get_surrounding
-gtk_im_context_get_type
+gtk_im_context_get_type G_GNUC_CONST
 gtk_im_context_reset
 gtk_im_context_set_client_window
 gtk_im_context_set_cursor_location
 gtk_im_context_set_surrounding
 gtk_im_context_set_use_preedit
 gtk_im_context_simple_add_table
-gtk_im_context_simple_get_type
+gtk_im_context_simple_get_type G_GNUC_CONST
 gtk_im_context_simple_new
 gtk_im_multicontext_append_menuitems
-gtk_im_multicontext_get_type
+gtk_im_multicontext_get_type G_GNUC_CONST
 gtk_im_multicontext_new
 gtk_im_preedit_style_get_type
 gtk_im_status_style_get_type
@@ -1183,14 +1183,14 @@ gtk_init_check_abi_check
 #endif
 gtk_init_with_args
 gtk_input_add_full
-gtk_input_dialog_get_type
+gtk_input_dialog_get_type G_GNUC_CONST
 gtk_input_dialog_new
 gtk_input_remove
 #ifdef INCLUDE_VARIABLES
 gtk_interface_age
 #endif
 gtk_invisible_get_screen
-gtk_invisible_get_type
+gtk_invisible_get_type G_GNUC_CONST
 gtk_invisible_new
 gtk_invisible_new_for_screen
 gtk_invisible_set_screen
@@ -1209,7 +1209,7 @@ gtk_item_factory_from_path
 gtk_item_factory_from_widget
 gtk_item_factory_get_item
 gtk_item_factory_get_item_by_action
-gtk_item_factory_get_type
+gtk_item_factory_get_type G_GNUC_CONST
 gtk_item_factory_get_widget
 gtk_item_factory_get_widget_by_action
 gtk_item_factory_new
@@ -1219,7 +1219,7 @@ gtk_item_factory_popup_data
 gtk_item_factory_popup_data_from_widget
 gtk_item_factory_popup_with_data
 gtk_item_factory_set_translate_func
-gtk_item_get_type
+gtk_item_get_type G_GNUC_CONST
 gtk_item_select
 gtk_item_toggle
 gtk_justification_get_type
@@ -1240,7 +1240,7 @@ gtk_label_get_selectable
 gtk_label_get_selection_bounds
 gtk_label_get_single_line_mode
 gtk_label_get_text
-gtk_label_get_type
+gtk_label_get_type G_GNUC_CONST
 gtk_label_get_use_markup
 gtk_label_get_use_underline
 gtk_label_get_width_chars
@@ -1268,7 +1268,7 @@ gtk_label_set_width_chars
 gtk_layout_freeze
 gtk_layout_get_hadjustment
 gtk_layout_get_size
-gtk_layout_get_type
+gtk_layout_get_type G_GNUC_CONST
 gtk_layout_get_vadjustment
 gtk_layout_move
 gtk_layout_new
@@ -1283,10 +1283,10 @@ gtk_list_clear_items
 gtk_list_end_drag_selection
 gtk_list_end_selection
 gtk_list_extend_selection
-gtk_list_get_type
+gtk_list_get_type G_GNUC_CONST
 gtk_list_insert_items
 gtk_list_item_deselect
-gtk_list_item_get_type
+gtk_list_item_get_type G_GNUC_CONST
 gtk_list_item_new
 gtk_list_item_new_with_label
 gtk_list_item_select
@@ -1303,7 +1303,7 @@ gtk_list_set_selection_mode
 gtk_list_start_selection
 gtk_list_store_append
 gtk_list_store_clear
-gtk_list_store_get_type
+gtk_list_store_get_type G_GNUC_CONST
 gtk_list_store_insert
 gtk_list_store_insert_after
 gtk_list_store_insert_before
@@ -1365,7 +1365,7 @@ gtk_marshal_VOID__UINT_STRING
 gtk_match_type_get_type
 gtk_menu_attach
 gtk_menu_attach_to_widget
-gtk_menu_bar_get_type
+gtk_menu_bar_get_type G_GNUC_CONST
 gtk_menu_bar_new
 gtk_menu_detach
 gtk_menu_direction_type_get_type
@@ -1375,12 +1375,12 @@ gtk_menu_get_attach_widget
 gtk_menu_get_for_attach_widget
 gtk_menu_get_tearoff_state
 gtk_menu_get_title
-gtk_menu_get_type
+gtk_menu_get_type G_GNUC_CONST
 gtk_menu_item_activate
 gtk_menu_item_deselect
 gtk_menu_item_get_right_justified
 gtk_menu_item_get_submenu
-gtk_menu_item_get_type
+gtk_menu_item_get_type G_GNUC_CONST
 gtk_menu_item_new
 gtk_menu_item_new_with_label
 gtk_menu_item_new_with_mnemonic
@@ -1408,22 +1408,22 @@ gtk_menu_shell_append
 gtk_menu_shell_cancel
 gtk_menu_shell_deactivate
 gtk_menu_shell_deselect
-gtk_menu_shell_get_type
+gtk_menu_shell_get_type G_GNUC_CONST
 gtk_menu_shell_insert
 gtk_menu_shell_prepend
 gtk_menu_shell_select_first
 gtk_menu_shell_select_item
 gtk_menu_tool_button_get_menu
-gtk_menu_tool_button_get_type
+gtk_menu_tool_button_get_type G_GNUC_CONST
 gtk_menu_tool_button_new
 gtk_menu_tool_button_new_from_stock
 gtk_menu_tool_button_set_arrow_tooltip
 gtk_menu_tool_button_set_menu
-gtk_message_dialog_format_secondary_markup
-gtk_message_dialog_format_secondary_text
-gtk_message_dialog_get_type
-gtk_message_dialog_new
-gtk_message_dialog_new_with_markup
+gtk_message_dialog_format_secondary_markup G_GNUC_PRINTF(2,3)
+gtk_message_dialog_format_secondary_text G_GNUC_PRINTF(2,3)
+gtk_message_dialog_get_type G_GNUC_CONST
+gtk_message_dialog_new G_GNUC_PRINTF(5,6)
+gtk_message_dialog_new_with_markup G_GNUC_PRINTF(5,6)
 gtk_message_dialog_set_markup
 gtk_message_type_get_type
 gtk_metric_type_get_type
@@ -1433,7 +1433,7 @@ gtk_minor_version
 #endif
 gtk_misc_get_alignment
 gtk_misc_get_padding
-gtk_misc_get_type
+gtk_misc_get_type G_GNUC_CONST
 gtk_misc_set_alignment
 gtk_misc_set_padding
 gtk_movement_step_get_type
@@ -1450,7 +1450,7 @@ gtk_notebook_get_show_tabs
 gtk_notebook_get_tab_label
 gtk_notebook_get_tab_label_text
 gtk_notebook_get_tab_pos
-gtk_notebook_get_type
+gtk_notebook_get_type G_GNUC_CONST
 gtk_notebook_insert_page
 gtk_notebook_insert_page_menu
 gtk_notebook_new
@@ -1485,7 +1485,7 @@ gtk_object_flags_get_type
 gtk_object_get
 gtk_object_get_data
 gtk_object_get_data_by_id
-gtk_object_get_type
+gtk_object_get_type G_GNUC_CONST
 gtk_object_get_user_data
 gtk_object_new
 gtk_object_ref
@@ -1505,10 +1505,10 @@ gtk_object_weakref
 gtk_object_weakunref
 gtk_old_editable_changed
 gtk_old_editable_claim_selection
-gtk_old_editable_get_type
+gtk_old_editable_get_type G_GNUC_CONST
 gtk_option_menu_get_history
 gtk_option_menu_get_menu
-gtk_option_menu_get_type
+gtk_option_menu_get_type G_GNUC_CONST
 gtk_option_menu_new
 gtk_option_menu_remove_menu
 gtk_option_menu_set_history
@@ -1542,16 +1542,16 @@ gtk_paned_compute_position
 gtk_paned_get_child1
 gtk_paned_get_child2
 gtk_paned_get_position
-gtk_paned_get_type
+gtk_paned_get_type G_GNUC_CONST
 gtk_paned_pack1
 gtk_paned_pack2
 gtk_paned_set_position
 gtk_parse_args
-gtk_path_bar_get_type
+gtk_path_bar_get_type G_GNUC_CONST
 gtk_path_priority_type_get_type
 gtk_path_type_get_type
 gtk_pixmap_get
-gtk_pixmap_get_type
+gtk_pixmap_get_type G_GNUC_CONST
 gtk_pixmap_new
 gtk_pixmap_set
 gtk_pixmap_set_build_insensitive
@@ -1559,7 +1559,7 @@ gtk_pixmap_set_build_insensitive
 gtk_plug_construct
 gtk_plug_construct_for_display
 gtk_plug_get_id
-gtk_plug_get_type
+gtk_plug_get_type G_GNUC_CONST
 gtk_plug_new
 gtk_plug_new_for_display
 #endif
@@ -1568,7 +1568,7 @@ gtk_position_type_get_type
 gtk_preview_draw_row
 gtk_preview_get_cmap
 gtk_preview_get_info
-gtk_preview_get_type
+gtk_preview_get_type G_GNUC_CONST
 gtk_preview_get_visual
 gtk_preview_new
 gtk_preview_put
@@ -1588,7 +1588,7 @@ gtk_progress_bar_get_orientation
 gtk_progress_bar_get_pulse_step
 gtk_progress_bar_get_text
 gtk_progress_bar_get_ellipsize
-gtk_progress_bar_get_type
+gtk_progress_bar_get_type G_GNUC_CONST
 gtk_progress_bar_new
 gtk_progress_bar_new_with_adjustment
 gtk_progress_bar_orientation_get_type
@@ -1609,7 +1609,7 @@ gtk_progress_get_current_percentage
 gtk_progress_get_current_text
 gtk_progress_get_percentage_from_value
 gtk_progress_get_text_from_value
-gtk_progress_get_type
+gtk_progress_get_type G_GNUC_CONST
 gtk_progress_get_value
 gtk_progress_set_activity_mode
 gtk_progress_set_adjustment
@@ -1626,11 +1626,11 @@ gtk_quit_remove
 gtk_quit_remove_by_data
 gtk_radio_action_get_current_value
 gtk_radio_action_get_group
-gtk_radio_action_get_type
+gtk_radio_action_get_type G_GNUC_CONST
 gtk_radio_action_new
 gtk_radio_action_set_group
 gtk_radio_button_get_group
-gtk_radio_button_get_type
+gtk_radio_button_get_type G_GNUC_CONST
 gtk_radio_button_new
 gtk_radio_button_new_from_widget
 gtk_radio_button_new_with_label
@@ -1639,7 +1639,7 @@ gtk_radio_button_new_with_mnemonic
 gtk_radio_button_new_with_mnemonic_from_widget
 gtk_radio_button_set_group
 gtk_radio_menu_item_get_group
-gtk_radio_menu_item_get_type
+gtk_radio_menu_item_get_type G_GNUC_CONST
 gtk_radio_menu_item_new
 gtk_radio_menu_item_new_from_widget
 gtk_radio_menu_item_new_with_label
@@ -1648,7 +1648,7 @@ gtk_radio_menu_item_new_with_mnemonic
 gtk_radio_menu_item_new_with_mnemonic_from_widget
 gtk_radio_menu_item_set_group
 gtk_radio_tool_button_get_group
-gtk_radio_tool_button_get_type
+gtk_radio_tool_button_get_type G_GNUC_CONST
 gtk_radio_tool_button_new
 gtk_radio_tool_button_new_from_stock
 gtk_radio_tool_button_new_from_widget
@@ -1656,7 +1656,7 @@ gtk_radio_tool_button_new_with_stock_from_widget
 gtk_radio_tool_button_set_group
 gtk_range_get_adjustment
 gtk_range_get_inverted
-gtk_range_get_type
+gtk_range_get_type G_GNUC_CONST
 gtk_range_get_update_policy
 gtk_range_get_value
 gtk_range_set_adjustment
@@ -1695,7 +1695,7 @@ gtk_rc_reset_styles
 gtk_rc_scanner_new
 gtk_rc_set_default_files
 gtk_rc_style_copy
-gtk_rc_style_get_type
+gtk_rc_style_get_type G_GNUC_CONST
 gtk_rc_style_new
 gtk_rc_style_ref
 gtk_rc_style_unref
@@ -1711,25 +1711,25 @@ gtk_ruler_draw_pos
 gtk_ruler_draw_ticks
 gtk_ruler_get_metric
 gtk_ruler_get_range
-gtk_ruler_get_type
+gtk_ruler_get_type G_GNUC_CONST
 gtk_ruler_set_metric
 gtk_ruler_set_range
 gtk_scale_get_digits
 gtk_scale_get_draw_value
 gtk_scale_get_layout
 gtk_scale_get_layout_offsets
-gtk_scale_get_type
+gtk_scale_get_type G_GNUC_CONST
 gtk_scale_get_value_pos
 gtk_scale_set_digits
 gtk_scale_set_draw_value
 gtk_scale_set_value_pos
-gtk_scrollbar_get_type
+gtk_scrollbar_get_type G_GNUC_CONST
 gtk_scrolled_window_add_with_viewport
 gtk_scrolled_window_get_hadjustment
 gtk_scrolled_window_get_placement
 gtk_scrolled_window_get_policy
 gtk_scrolled_window_get_shadow_type
-gtk_scrolled_window_get_type
+gtk_scrolled_window_get_type G_GNUC_CONST
 gtk_scrolled_window_get_vadjustment
 gtk_scrolled_window_new
 gtk_scrolled_window_set_hadjustment
@@ -1749,7 +1749,7 @@ gtk_selection_data_free
 gtk_selection_data_get_pixbuf
 gtk_selection_data_get_targets
 gtk_selection_data_get_text
-gtk_selection_data_get_type
+gtk_selection_data_get_type G_GNUC_CONST
 gtk_selection_data_get_uris
 gtk_selection_data_set
 gtk_selection_data_set_pixbuf
@@ -1761,17 +1761,17 @@ gtk_selection_mode_get_type
 gtk_selection_owner_set
 gtk_selection_owner_set_for_display
 gtk_selection_remove_all
-gtk_separator_get_type
-gtk_separator_menu_item_get_type
+gtk_separator_get_type G_GNUC_CONST
+gtk_separator_menu_item_get_type G_GNUC_CONST
 gtk_separator_menu_item_new
 gtk_separator_tool_item_get_draw
-gtk_separator_tool_item_get_type
+gtk_separator_tool_item_get_type G_GNUC_CONST
 gtk_separator_tool_item_new
 gtk_separator_tool_item_set_draw
 gtk_set_locale
 gtk_settings_get_default
 gtk_settings_get_for_screen
-gtk_settings_get_type
+gtk_settings_get_type G_GNUC_CONST
 gtk_settings_install_property
 gtk_settings_install_property_parser
 gtk_settings_set_double_property
@@ -1795,7 +1795,7 @@ gtk_signal_newv
 gtk_signal_run_type_get_type
 gtk_size_group_add_widget
 gtk_size_group_get_mode
-gtk_size_group_get_type
+gtk_size_group_get_type G_GNUC_CONST
 gtk_size_group_mode_get_type
 gtk_size_group_new
 gtk_size_group_remove_widget
@@ -1803,7 +1803,7 @@ gtk_size_group_set_mode
 #ifdef GTK_WINDOWING_X11
 gtk_socket_add_id
 gtk_socket_get_id
-gtk_socket_get_type
+gtk_socket_get_type G_GNUC_CONST
 gtk_socket_new
 gtk_socket_steal
 #endif
@@ -1815,7 +1815,7 @@ gtk_spin_button_get_increments
 gtk_spin_button_get_numeric
 gtk_spin_button_get_range
 gtk_spin_button_get_snap_to_ticks
-gtk_spin_button_get_type
+gtk_spin_button_get_type G_GNUC_CONST
 gtk_spin_button_get_update_policy
 gtk_spin_button_get_value
 gtk_spin_button_get_value_as_int
@@ -1838,7 +1838,7 @@ gtk_spin_type_get_type
 gtk_state_type_get_type
 gtk_statusbar_get_context_id
 gtk_statusbar_get_has_resize_grip
-gtk_statusbar_get_type
+gtk_statusbar_get_type G_GNUC_CONST
 gtk_statusbar_new
 gtk_statusbar_pop
 gtk_statusbar_push
@@ -1855,7 +1855,7 @@ gtk_style_attach
 gtk_style_copy
 gtk_style_detach
 gtk_style_get_font
-gtk_style_get_type
+gtk_style_get_type G_GNUC_CONST
 gtk_style_lookup_icon_set
 gtk_style_new
 gtk_style_ref
@@ -1872,7 +1872,7 @@ gtk_table_get_default_col_spacing
 gtk_table_get_default_row_spacing
 gtk_table_get_homogeneous
 gtk_table_get_row_spacing
-gtk_table_get_type
+gtk_table_get_type G_GNUC_CONST
 gtk_table_new
 gtk_table_resize
 gtk_table_set_col_spacing
@@ -1891,7 +1891,7 @@ gtk_target_list_new
 gtk_target_list_ref
 gtk_target_list_remove
 gtk_target_list_unref
-gtk_tearoff_menu_item_get_type
+gtk_tearoff_menu_item_get_type G_GNUC_CONST
 gtk_tearoff_menu_item_new
 gtk_text_anchored_child_set_layout
 #ifdef INCLUDE_VARIABLES
@@ -1939,7 +1939,7 @@ gtk_text_buffer_get_slice
 gtk_text_buffer_get_start_iter
 gtk_text_buffer_get_tag_table
 gtk_text_buffer_get_text
-gtk_text_buffer_get_type
+gtk_text_buffer_get_type G_GNUC_CONST
 gtk_text_buffer_insert
 gtk_text_buffer_insert_at_cursor
 gtk_text_buffer_insert_child_anchor
@@ -1967,7 +1967,7 @@ gtk_text_byte_begins_utf8_char
 gtk_text_char_type
 #endif
 gtk_text_child_anchor_get_deleted
-gtk_text_child_anchor_get_type
+gtk_text_child_anchor_get_type G_GNUC_CONST
 gtk_text_child_anchor_get_widgets
 gtk_text_child_anchor_new
 gtk_text_child_anchor_queue_resize
@@ -1981,7 +1981,7 @@ gtk_text_forward_delete
 gtk_text_freeze
 gtk_text_get_length
 gtk_text_get_point
-gtk_text_get_type
+gtk_text_get_type G_GNUC_CONST
 gtk_text_insert
 gtk_text_iter_backward_char
 gtk_text_iter_backward_chars
@@ -2047,7 +2047,7 @@ gtk_text_iter_get_slice
 gtk_text_iter_get_tags
 gtk_text_iter_get_text
 gtk_text_iter_get_toggled_tags
-gtk_text_iter_get_type
+gtk_text_iter_get_type G_GNUC_CONST
 gtk_text_iter_get_visible_line_index
 gtk_text_iter_get_visible_line_offset
 gtk_text_iter_get_visible_slice
@@ -2087,7 +2087,7 @@ gtk_text_layout_get_line_display
 gtk_text_layout_get_lines
 gtk_text_layout_get_line_yrange
 gtk_text_layout_get_size
-gtk_text_layout_get_type
+gtk_text_layout_get_type G_GNUC_CONST
 gtk_text_layout_invalidate
 gtk_text_layout_is_valid
 gtk_text_layout_iter_starts_line
@@ -2119,7 +2119,7 @@ gtk_text_mark_get_buffer
 gtk_text_mark_get_deleted
 gtk_text_mark_get_left_gravity
 gtk_text_mark_get_name
-gtk_text_mark_get_type
+gtk_text_mark_get_type G_GNUC_CONST
 gtk_text_mark_get_visible
 gtk_text_mark_set_visible
 gtk_text_new
@@ -2135,13 +2135,13 @@ gtk_text_set_point
 gtk_text_set_word_wrap
 gtk_text_tag_event
 gtk_text_tag_get_priority
-gtk_text_tag_get_type
+gtk_text_tag_get_type G_GNUC_CONST
 gtk_text_tag_new
 gtk_text_tag_set_priority
 gtk_text_tag_table_add
 gtk_text_tag_table_foreach
 gtk_text_tag_table_get_size
-gtk_text_tag_table_get_type
+gtk_text_tag_table_get_type G_GNUC_CONST
 gtk_text_tag_table_lookup
 gtk_text_tag_table_new
 gtk_text_tag_table_remove
@@ -2177,7 +2177,7 @@ gtk_text_view_get_pixels_below_lines
 gtk_text_view_get_pixels_inside_wrap
 gtk_text_view_get_right_margin
 gtk_text_view_get_tabs
-gtk_text_view_get_type
+gtk_text_view_get_type G_GNUC_CONST
 gtk_text_view_get_visible_rect
 gtk_text_view_get_window
 gtk_text_view_get_window_type
@@ -2211,11 +2211,11 @@ gtk_text_view_window_to_buffer_coords
 gtk_text_window_type_get_type
 gtk_theme_engine_create_rc_style
 gtk_theme_engine_get
-gtk_theme_engine_get_type
+gtk_theme_engine_get_type G_GNUC_CONST
 gtk_timeout_add
 gtk_timeout_add_full
 gtk_timeout_remove
-gtk_tips_query_get_type
+gtk_tips_query_get_type G_GNUC_CONST
 gtk_tips_query_new
 gtk_tips_query_set_caller
 gtk_tips_query_set_labels
@@ -2223,7 +2223,7 @@ gtk_tips_query_start_query
 gtk_tips_query_stop_query
 gtk_toggle_action_get_active
 gtk_toggle_action_get_draw_as_radio
-gtk_toggle_action_get_type
+gtk_toggle_action_get_type G_GNUC_CONST
 gtk_toggle_action_new
 gtk_toggle_action_set_active
 gtk_toggle_action_set_draw_as_radio
@@ -2231,7 +2231,7 @@ gtk_toggle_action_toggled
 gtk_toggle_button_get_active
 gtk_toggle_button_get_inconsistent
 gtk_toggle_button_get_mode
-gtk_toggle_button_get_type
+gtk_toggle_button_get_type G_GNUC_CONST
 gtk_toggle_button_new
 gtk_toggle_button_new_with_label
 gtk_toggle_button_new_with_mnemonic
@@ -2240,7 +2240,7 @@ gtk_toggle_button_set_inconsistent
 gtk_toggle_button_set_mode
 gtk_toggle_button_toggled
 gtk_toggle_tool_button_get_active
-gtk_toggle_tool_button_get_type
+gtk_toggle_tool_button_get_type G_GNUC_CONST
 gtk_toggle_tool_button_new
 gtk_toggle_tool_button_new_from_stock
 gtk_toggle_tool_button_set_active
@@ -2259,7 +2259,7 @@ gtk_toolbar_get_relief_style
 gtk_toolbar_get_show_arrow
 gtk_toolbar_get_style
 gtk_toolbar_get_tooltips
-gtk_toolbar_get_type
+gtk_toolbar_get_type G_GNUC_CONST
 gtk_toolbar_insert
 gtk_toolbar_insert_element
 gtk_toolbar_insert_item
@@ -2303,7 +2303,7 @@ gtk_tool_item_get_orientation
 gtk_tool_item_get_proxy_menu_item
 gtk_tool_item_get_relief_style
 gtk_tool_item_get_toolbar_style
-gtk_tool_item_get_type
+gtk_tool_item_get_type G_GNUC_CONST
 gtk_tool_item_get_use_drag_window
 gtk_tool_item_get_visible_horizontal
 gtk_tool_item_get_visible_vertical
@@ -2323,7 +2323,7 @@ gtk_tooltips_disable
 gtk_tooltips_enable
 gtk_tooltips_force_window
 gtk_tooltips_get_info_from_tip_window
-gtk_tooltips_get_type
+gtk_tooltips_get_type G_GNUC_CONST
 gtk_tooltips_new
 gtk_tooltips_set_delay
 gtk_tooltips_set_tip
@@ -2331,19 +2331,19 @@ gtk_tree_append
 gtk_tree_child_position
 gtk_tree_clear_items
 gtk_tree_drag_dest_drag_data_received
-gtk_tree_drag_dest_get_type
+gtk_tree_drag_dest_get_type G_GNUC_CONST
 gtk_tree_drag_dest_row_drop_possible
 gtk_tree_drag_source_drag_data_delete
 gtk_tree_drag_source_drag_data_get
-gtk_tree_drag_source_get_type
+gtk_tree_drag_source_get_type G_GNUC_CONST
 gtk_tree_drag_source_row_draggable
 gtk_tree_get_row_drag_data
-gtk_tree_get_type
+gtk_tree_get_type G_GNUC_CONST
 gtk_tree_insert
 gtk_tree_item_collapse
 gtk_tree_item_deselect
 gtk_tree_item_expand
-gtk_tree_item_get_type
+gtk_tree_item_get_type G_GNUC_CONST
 gtk_tree_item_new
 gtk_tree_item_new_with_label
 gtk_tree_item_remove_subtree
@@ -2351,14 +2351,14 @@ gtk_tree_item_select
 gtk_tree_item_set_subtree
 gtk_tree_iter_copy
 gtk_tree_iter_free
-gtk_tree_iter_get_type
+gtk_tree_iter_get_type G_GNUC_CONST
 gtk_tree_model_filter_clear_cache
 gtk_tree_model_filter_convert_child_iter_to_iter
 gtk_tree_model_filter_convert_child_path_to_path
 gtk_tree_model_filter_convert_iter_to_child_iter
 gtk_tree_model_filter_convert_path_to_child_path
 gtk_tree_model_filter_get_model
-gtk_tree_model_filter_get_type
+gtk_tree_model_filter_get_type G_GNUC_CONST
 gtk_tree_model_filter_new
 gtk_tree_model_filter_refilter
 gtk_tree_model_filter_set_modify_func
@@ -2375,7 +2375,7 @@ gtk_tree_model_get_iter_from_string
 gtk_tree_model_get_n_columns
 gtk_tree_model_get_path
 gtk_tree_model_get_string_from_iter
-gtk_tree_model_get_type
+gtk_tree_model_get_type G_GNUC_CONST
 gtk_tree_model_get_valist
 gtk_tree_model_get_value
 gtk_tree_model_iter_children
@@ -2396,7 +2396,7 @@ gtk_tree_model_sort_convert_child_path_to_path
 gtk_tree_model_sort_convert_iter_to_child_iter
 gtk_tree_model_sort_convert_path_to_child_path
 gtk_tree_model_sort_get_model
-gtk_tree_model_sort_get_type
+gtk_tree_model_sort_get_type G_GNUC_CONST
 gtk_tree_model_sort_iter_is_valid
 gtk_tree_model_sort_new_with_model
 gtk_tree_model_sort_reset_default_sort_func
@@ -2409,7 +2409,7 @@ gtk_tree_path_down
 gtk_tree_path_free
 gtk_tree_path_get_depth
 gtk_tree_path_get_indices
-gtk_tree_path_get_type
+gtk_tree_path_get_type G_GNUC_CONST
 gtk_tree_path_is_ancestor
 gtk_tree_path_is_descendant
 gtk_tree_path_new
@@ -2428,7 +2428,7 @@ gtk_tree_row_reference_copy
 gtk_tree_row_reference_deleted
 gtk_tree_row_reference_free
 gtk_tree_row_reference_get_path
-gtk_tree_row_reference_get_type
+gtk_tree_row_reference_get_type G_GNUC_CONST
 gtk_tree_row_reference_inserted
 gtk_tree_row_reference_new
 gtk_tree_row_reference_new_proxy
@@ -2440,7 +2440,7 @@ gtk_tree_selection_get_mode
 gtk_tree_selection_get_selected
 gtk_tree_selection_get_selected_rows
 gtk_tree_selection_get_tree_view
-gtk_tree_selection_get_type
+gtk_tree_selection_get_type G_GNUC_CONST
 gtk_tree_selection_get_user_data
 gtk_tree_selection_iter_is_selected
 gtk_tree_selection_path_is_selected
@@ -2461,7 +2461,7 @@ gtk_tree_set_selection_mode
 gtk_tree_set_view_lines
 gtk_tree_set_view_mode
 gtk_tree_sortable_get_sort_column_id
-gtk_tree_sortable_get_type
+gtk_tree_sortable_get_type G_GNUC_CONST
 gtk_tree_sortable_has_default_sort_func
 gtk_tree_sortable_set_default_sort_func
 gtk_tree_sortable_set_sort_column_id
@@ -2469,7 +2469,7 @@ gtk_tree_sortable_set_sort_func
 gtk_tree_sortable_sort_column_changed
 gtk_tree_store_append
 gtk_tree_store_clear
-gtk_tree_store_get_type
+gtk_tree_store_get_type G_GNUC_CONST
 gtk_tree_store_insert
 gtk_tree_store_insert_after
 gtk_tree_store_insert_before
@@ -2517,7 +2517,7 @@ gtk_tree_view_column_get_sort_indicator
 gtk_tree_view_column_get_sort_order
 gtk_tree_view_column_get_spacing
 gtk_tree_view_column_get_title
-gtk_tree_view_column_get_type
+gtk_tree_view_column_get_type G_GNUC_CONST
 gtk_tree_view_column_get_visible
 gtk_tree_view_column_get_widget
 gtk_tree_view_column_get_width
@@ -2575,7 +2575,7 @@ gtk_tree_view_get_rules_hint
 gtk_tree_view_get_search_column
 gtk_tree_view_get_search_equal_func
 gtk_tree_view_get_selection
-gtk_tree_view_get_type
+gtk_tree_view_get_type G_GNUC_CONST
 gtk_tree_view_get_vadjustment
 gtk_tree_view_get_visible_rect
 gtk_tree_view_insert_column
@@ -2615,7 +2615,7 @@ gtk_tree_view_tree_to_widget_coords
 gtk_tree_view_unset_rows_drag_dest
 gtk_tree_view_unset_rows_drag_source
 gtk_tree_view_widget_to_tree_coords
-gtk_true
+gtk_true G_GNUC_CONST
 gtk_type_class
 gtk_type_enum_find_value
 gtk_type_enum_get_values
@@ -2633,7 +2633,7 @@ gtk_ui_manager_get_action
 gtk_ui_manager_get_action_groups
 gtk_ui_manager_get_add_tearoffs
 gtk_ui_manager_get_toplevels
-gtk_ui_manager_get_type
+gtk_ui_manager_get_type G_GNUC_CONST
 gtk_ui_manager_get_ui
 gtk_ui_manager_get_widget
 gtk_ui_manager_insert_action_group
@@ -2644,33 +2644,33 @@ gtk_ui_manager_remove_action_group
 gtk_ui_manager_remove_ui
 gtk_ui_manager_set_add_tearoffs
 gtk_update_type_get_type
-gtk_vbox_get_type
+gtk_vbox_get_type G_GNUC_CONST
 gtk_vbox_new
 gtk_vbutton_box_get_layout_default
 gtk_vbutton_box_get_spacing_default
-gtk_vbutton_box_get_type
+gtk_vbutton_box_get_type G_GNUC_CONST
 gtk_vbutton_box_new
 gtk_vbutton_box_set_layout_default
 gtk_vbutton_box_set_spacing_default
 gtk_viewport_get_hadjustment
 gtk_viewport_get_shadow_type
-gtk_viewport_get_type
+gtk_viewport_get_type G_GNUC_CONST
 gtk_viewport_get_vadjustment
 gtk_viewport_new
 gtk_viewport_set_hadjustment
 gtk_viewport_set_shadow_type
 gtk_viewport_set_vadjustment
 gtk_visibility_get_type
-gtk_vpaned_get_type
+gtk_vpaned_get_type G_GNUC_CONST
 gtk_vpaned_new
-gtk_vruler_get_type
+gtk_vruler_get_type G_GNUC_CONST
 gtk_vruler_new
-gtk_vscale_get_type
+gtk_vscale_get_type G_GNUC_CONST
 gtk_vscale_new
 gtk_vscale_new_with_range
-gtk_vscrollbar_get_type
+gtk_vscrollbar_get_type G_GNUC_CONST
 gtk_vscrollbar_new
-gtk_vseparator_get_type
+gtk_vseparator_get_type G_GNUC_CONST
 gtk_vseparator_new
 gtk_widget_activate
 gtk_widget_add_accelerator
@@ -2721,7 +2721,7 @@ gtk_widget_get_settings
 gtk_widget_get_size_request
 gtk_widget_get_style
 gtk_widget_get_toplevel
-gtk_widget_get_type
+gtk_widget_get_type G_GNUC_CONST
 gtk_widget_get_visual
 gtk_widget_grab_default
 gtk_widget_grab_focus
@@ -2838,10 +2838,10 @@ gtk_window_get_skip_pager_hint
 gtk_window_get_skip_taskbar_hint
 gtk_window_get_title
 gtk_window_get_transient_for
-gtk_window_get_type
+gtk_window_get_type G_GNUC_CONST
 gtk_window_get_type_hint
 gtk_window_group_add_window
-gtk_window_group_get_type
+gtk_window_group_get_type G_GNUC_CONST
 gtk_window_group_new
 gtk_window_group_remove_window
 gtk_window_has_toplevel_focus

diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index 5e17a217ca56420367831d69cb26ec8da6709879..7e89ddf98aae16564730c8a3a246a0649f40be4d 100644 (file)
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -101,7 +101,7 @@ struct _GtkAccelKey
 
 
 /* -- Accelerator Groups --- */
-GType          gtk_accel_group_get_type           (void);
+GType          gtk_accel_group_get_type           (void) G_GNUC_CONST;
 GtkAccelGroup* gtk_accel_group_new               (void);
 void          gtk_accel_group_lock               (GtkAccelGroup  *accel_group);
 void          gtk_accel_group_unlock             (GtkAccelGroup  *accel_group);

diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
index 0dedcd79814eb3e30b4861d84a0cd7616c4b6490..853e657b19423fd4a19395859473fb58d9d10329 100644 (file)
--- a/gtk/gtkaccessible.h
+++ b/gtk/gtkaccessible.h
@@ -65,7 +65,7 @@ struct _GtkAccessibleClass
   void (*_gtk_reserved4) (void);
 };
 
-GType gtk_accessible_get_type (void);
+GType gtk_accessible_get_type (void) G_GNUC_CONST;
 
 void gtk_accessible_connect_widget_destroyed    (GtkAccessible     *accessible);
 

diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 193e9dcd833d76a6a8aa2bc3330214849ed18ede..ddf3c3c42e94a61ddb4183159335128133305bfc 100644 (file)
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -80,7 +80,7 @@ struct _GtkActionClass
   void (*_gtk_reserved4) (void);
 };
 
-GType        gtk_action_get_type               (void);
+GType        gtk_action_get_type               (void) G_GNUC_CONST;
 GtkAction   *gtk_action_new                    (const gchar *name,
                                                const gchar *label,
                                                const gchar *tooltip,

diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 5469e8f2245a2f3816d5908be620271791f7d5c9..0f5df5942daf74e7f666794d036a5e52522ee357 100644 (file)
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -103,7 +103,7 @@ struct _GtkRadioActionEntry
   gint   value; 
 };
 
-GType           gtk_action_group_get_type                (void);
+GType           gtk_action_group_get_type                (void) G_GNUC_CONST;
 GtkActionGroup *gtk_action_group_new                     (const gchar                *name);
 G_CONST_RETURN gchar *gtk_action_group_get_name          (GtkActionGroup             *action_group);
 gboolean        gtk_action_group_get_sensitive           (GtkActionGroup             *action_group);

diff --git a/gtk/gtkcelllayout.h b/gtk/gtkcelllayout.h
index 2458df3a7660d25292c7ecf79e2798e1f41e580e..818bf02f36858bb5cf0f2f88f77acfb2ceb62ea6 100644 (file)
--- a/gtk/gtkcelllayout.h
+++ b/gtk/gtkcelllayout.h
@@ -70,7 +70,7 @@ struct _GtkCellLayoutIface
                                gint                   position);
 };
 
-GType gtk_cell_layout_get_type           (void);
+GType gtk_cell_layout_get_type           (void) G_GNUC_CONST;
 void  gtk_cell_layout_pack_start         (GtkCellLayout         *cell_layout,
                                           GtkCellRenderer       *cell,
                                           gboolean               expand);

diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h
index 81685439626a16eff49fcd8e12508b382196f40d..f3efe33cb107620375fdf0ed1df5c1649fb5c5f5 100644 (file)
--- a/gtk/gtkcellrenderercombo.h
+++ b/gtk/gtkcellrenderercombo.h
@@ -53,7 +53,7 @@ struct _GtkCellRendererComboClass
   GtkCellRendererTextClass parent;
 };
 
-GType            gtk_cell_renderer_combo_get_type (void);
+GType            gtk_cell_renderer_combo_get_type (void) G_GNUC_CONST;
 GtkCellRenderer *gtk_cell_renderer_combo_new      (void);
 
 G_END_DECLS

diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h
index 9484a955b4b9e31ccb555b8d26deb9f4d614fc2d..85c6bb34591895c3691441ff869576ea32f96414 100644 (file)
--- a/gtk/gtkcellrendererpixbuf.h
+++ b/gtk/gtkcellrendererpixbuf.h
@@ -58,7 +58,7 @@ struct _GtkCellRendererPixbufClass
   void (*_gtk_reserved4) (void);
 };
 
-GType            gtk_cell_renderer_pixbuf_get_type (void);
+GType            gtk_cell_renderer_pixbuf_get_type (void) G_GNUC_CONST;
 GtkCellRenderer *gtk_cell_renderer_pixbuf_new      (void);
 
 #ifdef __cplusplus

diff --git a/gtk/gtkcellrendererprogress.h b/gtk/gtkcellrendererprogress.h
index dddc71ea80494485e381cc23462523991d7f9791..6e84cd0e48d9247fcc0aec53615956f04b9cdc29 100644 (file)
--- a/gtk/gtkcellrendererprogress.h
+++ b/gtk/gtkcellrendererprogress.h
@@ -61,7 +61,7 @@ struct _GtkCellRendererProgressClass
   void (*_gtk_reserved4) (void);
 };
 
-GType           gtk_cell_renderer_progress_get_type (void);
+GType           gtk_cell_renderer_progress_get_type (void) G_GNUC_CONST;
 GtkCellRenderer* gtk_cell_renderer_progress_new      (void);
 
 G_END_DECLS

diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h
index a5107f036980834494effa6581a4410c40c412ad..599bb8b27bfb347e7bd6ffa103df818884adffcc 100644 (file)
--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@@ -90,7 +90,7 @@ struct _GtkCellRendererTextClass
   void (*_gtk_reserved4) (void);
 };
 
-GType            gtk_cell_renderer_text_get_type (void);
+GType            gtk_cell_renderer_text_get_type (void) G_GNUC_CONST;
 GtkCellRenderer *gtk_cell_renderer_text_new      (void);
 
 void             gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer,

diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h
index 859e5452708b7b992c8c03462bec0b4ddb381329..fe8983e1f55a7e8904116bbbc109a0e7f3b873f0 100644 (file)
--- a/gtk/gtkcellrenderertoggle.h
+++ b/gtk/gtkcellrenderertoggle.h
@@ -61,7 +61,7 @@ struct _GtkCellRendererToggleClass
   void (*_gtk_reserved4) (void);
 };
 
-GType            gtk_cell_renderer_toggle_get_type  (void);
+GType            gtk_cell_renderer_toggle_get_type  (void) G_GNUC_CONST;
 GtkCellRenderer *gtk_cell_renderer_toggle_new       (void);
 
 gboolean         gtk_cell_renderer_toggle_get_radio (GtkCellRendererToggle *toggle);

diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index 890f95e0616d57d94f2aa42075b57e0c90493a52..9ad2f51ef5d4c0ed66c21a4d6f0296b2521fb6c7 100644 (file)
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -50,7 +50,7 @@ struct _GtkCellViewClass
   GtkWidgetClass parent_class;
 };
 
-GType             gtk_cell_view_get_type               (void);
+GType             gtk_cell_view_get_type               (void) G_GNUC_CONST;
 GtkWidget        *gtk_cell_view_new                    (void);
 GtkWidget        *gtk_cell_view_new_with_text          (const gchar     *text);
 GtkWidget        *gtk_cell_view_new_with_markup        (const gchar     *markup);

diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h
index 319c38aca64e5309f4d723baeb68d319526531ae..dee672fa5562fe440fb2b8990c102627e6fcb2b0 100644 (file)
--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@@ -57,7 +57,7 @@ typedef void (* GtkClipboardGetFunc)          (GtkClipboard     *clipboard,
 typedef void (* GtkClipboardClearFunc)        (GtkClipboard     *clipboard,
                                               gpointer          user_data_or_owner);
 
-GType         gtk_clipboard_get_type (void);
+GType         gtk_clipboard_get_type (void) G_GNUC_CONST;
 
 GtkClipboard *gtk_clipboard_get_for_display (GdkDisplay   *display,
                                             GdkAtom       selection);

diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 6bc5405d179e9bf0c32832f79c8d660f46178d15..79c675837ae656362a7401a150de841dd2381fd7 100644 (file)
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -61,7 +61,7 @@ struct _GtkComboBoxClass
 
 
 /* construction */
-GType         gtk_combo_box_get_type         (void);
+GType         gtk_combo_box_get_type         (void) G_GNUC_CONST;
 GtkWidget    *gtk_combo_box_new              (void);
 GtkWidget    *gtk_combo_box_new_with_model   (GtkTreeModel    *model);
 

diff --git a/gtk/gtkcomboboxentry.h b/gtk/gtkcomboboxentry.h
index 8955426b9e3b38919bab990ff5db73ee9b5cb9ff..5fc71d10deeaa4692f0deb5417e014e712e5b65c 100644 (file)
--- a/gtk/gtkcomboboxentry.h
+++ b/gtk/gtkcomboboxentry.h
@@ -56,7 +56,7 @@ struct _GtkComboBoxEntryClass
 };
 
 
-GType       gtk_combo_box_entry_get_type        (void);
+GType       gtk_combo_box_entry_get_type        (void) G_GNUC_CONST;
 GtkWidget  *gtk_combo_box_entry_new             (void);
 GtkWidget  *gtk_combo_box_entry_new_with_model  (GtkTreeModel     *model,
                                                  gint              text_column);

diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h
index 72d00c7daf6e6e9b1cbd52d0991db3aad17bafcd..addac0b5a70dbb5fd0f1f8a331f51adb3a888538 100644 (file)
--- a/gtk/gtkentrycompletion.h
+++ b/gtk/gtkentrycompletion.h
@@ -73,7 +73,7 @@ struct _GtkEntryCompletionClass
 };
 
 /* core */
-GType               gtk_entry_completion_get_type               (void);
+GType               gtk_entry_completion_get_type               (void) G_GNUC_CONST;
 GtkEntryCompletion *gtk_entry_completion_new                    (void);
 
 GtkWidget          *gtk_entry_completion_get_entry              (GtkEntryCompletion          *completion);

diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index 7c568848b75330b6f86606ea877abe69fb51fa7f..e5bfa454404f95acda051c5308f26907e8c5d4cf 100644 (file)
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -56,7 +56,7 @@ struct _GtkExpanderClass
   void        (* activate) (GtkExpander *expander);
 };
 
-GType                 gtk_expander_get_type          (void);
+GType                 gtk_expander_get_type          (void) G_GNUC_CONST;
 
 GtkWidget            *gtk_expander_new               (const gchar *label);
 GtkWidget            *gtk_expander_new_with_mnemonic (const gchar *label);

diff --git a/gtk/gtkfilechooser.h b/gtk/gtkfilechooser.h
index 7c5f958ee2620b9b56c22c3de8bf2d76dc6ac754..1078f53a77ee7b4a2ff2471bb13821fe51da0446 100644 (file)
--- a/gtk/gtkfilechooser.h
+++ b/gtk/gtkfilechooser.h
@@ -40,7 +40,7 @@ typedef enum
   GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
 } GtkFileChooserAction;
 
-GType gtk_file_chooser_get_type (void);
+GType gtk_file_chooser_get_type (void) G_GNUC_CONST;
 
 /* GError enumeration for GtkFileChooser */
 

diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h
index 803085cba1cdc0dfe5e9b76efa2b220663d5fa2a..d0ff1b2d1d49216cbecf01b0ebb0b3e1c51e00d9 100644 (file)
--- a/gtk/gtkfilechooserdialog.h
+++ b/gtk/gtkfilechooserdialog.h
@@ -50,7 +50,7 @@ struct _GtkFileChooserDialog
   GtkFileChooserDialogPrivate *priv;
 };
 
-GType      gtk_file_chooser_dialog_get_type         (void);
+GType      gtk_file_chooser_dialog_get_type         (void) G_GNUC_CONST;
 GtkWidget *gtk_file_chooser_dialog_new              (const gchar          *title,
                                                     GtkWindow            *parent,
                                                     GtkFileChooserAction  action,

diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h
index f6befb562e73a0c50ae9a8c0648c06730cb39ec1..2df7ded17fb5688e8a50c33f33696a8190ee4e8e 100644 (file)
--- a/gtk/gtkfilechooserwidget.h
+++ b/gtk/gtkfilechooserwidget.h
@@ -50,7 +50,7 @@ struct _GtkFileChooserWidget
   GtkFileChooserWidgetPrivate *priv;
 };
 
-GType      gtk_file_chooser_widget_get_type         (void);
+GType      gtk_file_chooser_widget_get_type         (void) G_GNUC_CONST;
 GtkWidget *gtk_file_chooser_widget_new              (GtkFileChooserAction  action);
 GtkWidget *gtk_file_chooser_widget_new_with_backend (GtkFileChooserAction  action,
                                                     const gchar          *backend);

diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h
index a4b909b0a4355353887ebbcf06101988354c7551..fd074f87ec9c5fb764fb34dabd27ae64551a5c66 100644 (file)
--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@@ -52,7 +52,7 @@ struct _GtkFileFilterInfo
   const gchar *mime_type;
 };
 
-GType gtk_file_filter_get_type (void);
+GType gtk_file_filter_get_type (void) G_GNUC_CONST;
 
 GtkFileFilter *       gtk_file_filter_new      (void);
 void                  gtk_file_filter_set_name (GtkFileFilter *filter,

diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h
index cc5ada841ed4b9f2acf679e241e02dd3aa5dd6c6..83ec6f63a3e5db8f02febd0fd48a9e10e2689ece 100644 (file)
--- a/gtk/gtkfilesystem.h
+++ b/gtk/gtkfilesystem.h
@@ -79,7 +79,7 @@ GQuark     gtk_file_system_error_quark      (void);
  */
 #define GTK_TYPE_FILE_INFO (gtk_file_info_get_type ())
 
-GType       gtk_file_info_get_type (void);
+GType       gtk_file_info_get_type (void) G_GNUC_CONST; 
 
 GtkFileInfo *gtk_file_info_new  (void);
 GtkFileInfo *gtk_file_info_copy (GtkFileInfo *info);
@@ -201,7 +201,7 @@ struct _GtkFileSystemIface
   void (*bookmarks_changed) (GtkFileSystem *file_system);
 };
 
-GType             gtk_file_system_get_type       (void);
+GType             gtk_file_system_get_type       (void) G_GNUC_CONST;
 
 GSList *          gtk_file_system_list_volumes   (GtkFileSystem     *file_system);
 
@@ -313,7 +313,7 @@ struct _GtkFileFolderIface
   void     (*finished_loading)    (GtkFileFolder *folder);
 };
 
-GType        gtk_file_folder_get_type      (void);
+GType        gtk_file_folder_get_type      (void) G_GNUC_CONST;
 gboolean     gtk_file_folder_list_children (GtkFileFolder      *folder,
                                            GSList            **children,
                                            GError            **error);
@@ -327,7 +327,7 @@ gboolean     gtk_file_folder_is_finished_loading (GtkFileFolder *folder);
 /* GtkFilePath */
 #define GTK_TYPE_FILE_PATH             (gtk_file_path_get_type ())
 
-GType   gtk_file_path_get_type (void);
+GType   gtk_file_path_get_type (void) G_GNUC_CONST;
 #ifdef __GNUC__
 #define gtk_file_path_new_dup(str) \
  ({ const gchar *__s = (str); (GtkFilePath *)g_strdup(__s); })

diff --git a/gtk/gtkfilesystemunix.h b/gtk/gtkfilesystemunix.h
index 2c2e6d540090543b72259f4324998621ad5fd621..9c8e9e2b1019570edb1c2aaf8a01313c057539e2 100644 (file)
--- a/gtk/gtkfilesystemunix.h
+++ b/gtk/gtkfilesystemunix.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 typedef struct _GtkFileSystemUnix      GtkFileSystemUnix;
 
 GtkFileSystem *gtk_file_system_unix_new       (void);
-GType          gtk_file_system_unix_get_type (void);
+GType          gtk_file_system_unix_get_type (void) G_GNUC_CONST;
      
 G_END_DECLS
 

diff --git a/gtk/gtkfilesystemwin32.h b/gtk/gtkfilesystemwin32.h
index df456072de994732390fe989e8b3313b93b03df1..a8704e6bd39d2c9215f14c45a0d95e44cd2d88c3 100644 (file)
--- a/gtk/gtkfilesystemwin32.h
+++ b/gtk/gtkfilesystemwin32.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 typedef struct _GtkFileSystemWin32      GtkFileSystemWin32;
 
 GtkFileSystem *gtk_file_system_win32_new      (void);
-GType          gtk_file_system_win32_get_type (void);
+GType          gtk_file_system_win32_get_type (void) G_GNUC_CONST;
      
 G_END_DECLS
 

diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index 200c0ad59a81b630eeae55e1b9d7e37f4cd603a6..fd22b8db54d55b780da0d4189b2b8730d06506cf 100644 (file)
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -63,7 +63,7 @@ struct _GtkIconFactoryClass
   void (*_gtk_reserved4) (void);
 };
 
-GType           gtk_icon_factory_get_type (void);
+GType           gtk_icon_factory_get_type (void) G_GNUC_CONST;
 GtkIconFactory* gtk_icon_factory_new      (void);
 void            gtk_icon_factory_add      (GtkIconFactory *factory,
                                            const gchar    *stock_id,
@@ -108,7 +108,7 @@ G_CONST_RETURN gchar* gtk_icon_size_get_name       (GtkIconSize  size);
 
 /* Icon sets */
 
-GType       gtk_icon_set_get_type        (void);
+GType       gtk_icon_set_get_type        (void) G_GNUC_CONST;
 GtkIconSet* gtk_icon_set_new             (void);
 GtkIconSet* gtk_icon_set_new_from_pixbuf (GdkPixbuf       *pixbuf);
 
@@ -135,7 +135,7 @@ void           gtk_icon_set_get_sizes    (GtkIconSet          *icon_set,
                                           GtkIconSize        **sizes,
                                           gint                *n_sizes);
 
-GType          gtk_icon_source_get_type                 (void);
+GType          gtk_icon_source_get_type                 (void) G_GNUC_CONST;
 GtkIconSource* gtk_icon_source_new                      (void);
 GtkIconSource* gtk_icon_source_copy                     (const GtkIconSource *source);
 void           gtk_icon_source_free                     (GtkIconSource       *source);

diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index aa41a99b2dcbbd29f16c847a5fef6881d8a288b2..7b7f2b1fc392b79c99bfaf64e738c9156e2f45ca 100644 (file)
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -90,7 +90,7 @@ typedef enum {
   GTK_ICON_THEME_FAILED
 } GtkIconThemeError;
 
-GQuark gtk_icon_theme_error_quark (void) G_GNUC_CONST;
+GQuark gtk_icon_theme_error_quark (void);
 
 GType         gtk_icon_theme_get_type              (void) G_GNUC_CONST;
 
@@ -138,7 +138,7 @@ void       gtk_icon_theme_add_builtin_icon  (const gchar *icon_name,
                                             gint         size,
                                             GdkPixbuf   *pixbuf);
 
-GType         gtk_icon_info_get_type (void);
+GType         gtk_icon_info_get_type (void) G_GNUC_CONST;
 GtkIconInfo  *gtk_icon_info_copy     (GtkIconInfo *icon_info);
 void          gtk_icon_info_free     (GtkIconInfo *icon_info);
 

diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h
index 07e3e8a55f844a7e88fc7831b923c742e36a4b41..0c24504e3e9a5fd45ef29971df587b7a530eb38f 100644 (file)
--- a/gtk/gtkiconview.h
+++ b/gtk/gtkiconview.h
@@ -69,7 +69,7 @@ struct _GtkIconViewClass
   gboolean (* activate_cursor_item)  (GtkIconView      *icon_view);
 };
 
-GType      gtk_icon_view_get_type       (void);
+GType      gtk_icon_view_get_type       (void) G_GNUC_CONST;
 GtkWidget *gtk_icon_view_new            (void);
 GtkWidget *gtk_icon_view_new_with_model (GtkTreeModel *model);
 

diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index b61fc1c48aab81ba9f9349dfe7283b814a315db5..d653acf223ff6efdb38536fc85b35796f9c38c85 100644 (file)
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -69,7 +69,7 @@ struct _GtkListStoreClass
 };
 
 
-GType         gtk_list_store_get_type         (void);
+GType         gtk_list_store_get_type         (void) G_GNUC_CONST;
 GtkListStore *gtk_list_store_new              (gint          n_columns,
                                               ...);
 GtkListStore *gtk_list_store_newv             (gint          n_columns,

diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h
index 6f7539b0fd020d886c9b0bc35965846fe7797558..b1e87ed52f7a147a7c61f9efb28ab9f7fb676ff1 100644 (file)
--- a/gtk/gtkmenutoolbutton.h
+++ b/gtk/gtkmenutoolbutton.h
@@ -59,7 +59,7 @@ struct _GtkMenuToolButtonClass
   void (*_gtk_reserved4) (void);
 };
 
-GType         gtk_menu_tool_button_get_type       (void);
+GType         gtk_menu_tool_button_get_type       (void) G_GNUC_CONST;
 GtkToolItem  *gtk_menu_tool_button_new            (GtkWidget   *icon_widget,
                                                    const gchar *label);
 GtkToolItem  *gtk_menu_tool_button_new_from_stock (const gchar *stock_id);

diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h
index 479b91d7145e79fd6b3f2736026c116e42567084..fc3f6d39f63a63d8cc57e2a8fef7cf5ebf6ee70f 100644 (file)
--- a/gtk/gtkmessagedialog.h
+++ b/gtk/gtkmessagedialog.h
@@ -83,7 +83,7 @@ struct _GtkMessageDialogClass
   void (*_gtk_reserved4) (void);
 };
 
-GType      gtk_message_dialog_get_type (void);
+GType      gtk_message_dialog_get_type (void) G_GNUC_CONST;
 
 GtkWidget* gtk_message_dialog_new      (GtkWindow      *parent,
                                         GtkDialogFlags  flags,

diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h
index 9dd7d0cfc41a755bd7d358d2aa9d0694105724ce..75a079819bc7ebb7f2205fb6be9dfa1ad5951446 100644 (file)
--- a/gtk/gtkradioaction.h
+++ b/gtk/gtkradioaction.h
@@ -67,7 +67,7 @@ struct _GtkRadioActionClass
   void (*_gtk_reserved4) (void);
 };
 
-GType           gtk_radio_action_get_type          (void);
+GType           gtk_radio_action_get_type          (void) G_GNUC_CONST;
 GtkRadioAction *gtk_radio_action_new               (const gchar           *name,
                                                     const gchar           *label,
                                                     const gchar           *tooltip,

diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index f3df99e10b5fe5d750aaad7a2fbe2c46bcb9e221..49e906fa6a8989c98e6a304b6f99ffbf6d1b3cef 100644 (file)
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -176,7 +176,7 @@ gboolean _gtk_selection_notify                (GtkWidget         *widget,
 gboolean _gtk_selection_property_notify          (GtkWidget         *widget,
                                           GdkEventProperty  *event);
 
-GType             gtk_selection_data_get_type (void);
+GType             gtk_selection_data_get_type (void) G_GNUC_CONST;
 GtkSelectionData *gtk_selection_data_copy     (GtkSelectionData *data);
 void             gtk_selection_data_free     (GtkSelectionData *data);
 

diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index 80bb73e3da7a2b2dbb309acb5be0d1a6ed21089f..f058e00a6853ad5f3da13674efe6bcaa5013ab3a 100644 (file)
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -69,7 +69,7 @@ struct _GtkSettingsValue
 
 
 /* --- functions --- */
-GType          gtk_settings_get_type                (void);
+GType          gtk_settings_get_type                (void) G_GNUC_CONST;
 #ifndef GDK_MULTIHEAD_SAFE
 GtkSettings*   gtk_settings_get_default             (void);
 #endif

diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 29b3bd01dcee25c4831ce4e86c443115e7facc91..ba1f883bc445f3683bb67c4621338597049e61ba 100644 (file)
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -85,7 +85,7 @@ GtkTextBuffer *gtk_text_iter_get_buffer (const GtkTextIter *iter);
 GtkTextIter *gtk_text_iter_copy     (const GtkTextIter *iter);
 void         gtk_text_iter_free     (GtkTextIter       *iter);
 
-GType        gtk_text_iter_get_type (void);
+GType        gtk_text_iter_get_type (void) G_GNUC_CONST;
 
 /*
  * Convert to different kinds of index

diff --git a/gtk/gtkthemes.h b/gtk/gtkthemes.h
index 4c8b9a5550b8660f6c7195f8e429c5443c9717a3..8185a7f82d14e1c2209c0a8c9ee5798929099ea7 100644 (file)
--- a/gtk/gtkthemes.h
+++ b/gtk/gtkthemes.h
@@ -40,7 +40,7 @@ extern "C" {
 #define GTK_THEME_ENGINE(theme_engine)    (G_TYPE_CHECK_INSTANCE_CAST ((theme_engine), GTK_TYPE_THEME_ENGINE, GtkThemeEngine))
 #define GTK_IS_THEME_ENGINE(theme_engine) (G_TYPE_CHECK_INSTANCE_TYPE ((theme_engine), GTK_TYPE_THEME_ENGINE))
 
-GType           gtk_theme_engine_get_type        (void);
+GType           gtk_theme_engine_get_type        (void) G_GNUC_CONST;
 GtkThemeEngine *gtk_theme_engine_get             (const gchar     *name);
 GtkRcStyle     *gtk_theme_engine_create_rc_style (GtkThemeEngine  *engine);
 

diff --git a/gtk/gtktoggleaction.h b/gtk/gtktoggleaction.h
index 2a2b260d1669eb9b072a56edfd0341e5f75a6879..6325c35ba6feaa38a03bba3eff38496a60a72d3f 100644 (file)
--- a/gtk/gtktoggleaction.h
+++ b/gtk/gtktoggleaction.h
@@ -67,7 +67,7 @@ struct _GtkToggleActionClass
   void (*_gtk_reserved4) (void);
 };
 
-GType            gtk_toggle_action_get_type          (void);
+GType            gtk_toggle_action_get_type          (void) G_GNUC_CONST;
 GtkToggleAction *gtk_toggle_action_new               (const gchar     *name,
                                                       const gchar     *label,
                                                       const gchar     *tooltip,

diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index d86d64f43a8feb06d3056f6d8fe7b95bc76922ef..8a78a11fb8250ae2336f45e37fb9fbff0cbfbcd3 100644 (file)
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -62,7 +62,7 @@ struct _GtkToolButtonClass
   void (* _gtk_reserved4) (void);
 };
 
-GType        gtk_tool_button_get_type       (void);
+GType        gtk_tool_button_get_type       (void) G_GNUC_CONST;
 GtkToolItem *gtk_tool_button_new            (GtkWidget   *icon_widget,
                                             const gchar *label);
 GtkToolItem *gtk_tool_button_new_from_stock (const gchar *stock_id);

diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 1293585f6dbb2dcce1ac973861a32f3251d44354..10cf4711cad6c4afcb52da48de3547c40fdd9d4b 100644 (file)
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -67,7 +67,7 @@ struct _GtkToolItemClass
   void (* _gtk_reserved4) (void);
 };
 
-GType        gtk_tool_item_get_type (void);
+GType        gtk_tool_item_get_type (void) G_GNUC_CONST;
 GtkToolItem *gtk_tool_item_new      (void);
 
 void            gtk_tool_item_set_homogeneous          (GtkToolItem *tool_item,

diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h
index 69fa497fd0dee5b0270323bafb54da5e70a20357..22419e95cd9a683980b5be0bc5f740bcfec2408f 100644 (file)
--- a/gtk/gtktreemodel.h
+++ b/gtk/gtktreemodel.h
@@ -132,7 +132,7 @@ gint         gtk_tree_path_get_depth        (GtkTreePath       *path);
 gint        *gtk_tree_path_get_indices      (GtkTreePath       *path);
 void         gtk_tree_path_free             (GtkTreePath       *path);
 GtkTreePath *gtk_tree_path_copy             (const GtkTreePath *path);
-GType        gtk_tree_path_get_type         (void);
+GType        gtk_tree_path_get_type         (void) G_GNUC_CONST;
 gint         gtk_tree_path_compare          (const GtkTreePath *a,
                                             const GtkTreePath *b);
 void         gtk_tree_path_next             (GtkTreePath       *path);
@@ -154,7 +154,7 @@ gboolean     gtk_tree_path_is_descendant    (GtkTreePath       *path,
  * want to call gtk_tree_row_reference_new.
  */
 
-GType                gtk_tree_row_reference_get_type (void);
+GType                gtk_tree_row_reference_get_type (void) G_GNUC_CONST;
 GtkTreeRowReference *gtk_tree_row_reference_new       (GtkTreeModel        *model,
                                                       GtkTreePath         *path);
 GtkTreeRowReference *gtk_tree_row_reference_new_proxy (GObject             *proxy,
@@ -178,7 +178,7 @@ void                 gtk_tree_row_reference_reordered (GObject     *proxy,
 /* GtkTreeIter operations */
 GtkTreeIter *     gtk_tree_iter_copy             (GtkTreeIter  *iter);
 void              gtk_tree_iter_free             (GtkTreeIter  *iter);
-GType             gtk_tree_iter_get_type         (void);
+GType             gtk_tree_iter_get_type         (void) G_GNUC_CONST;
 
 GType             gtk_tree_model_get_type        (void) G_GNUC_CONST;
 GtkTreeModelFlags gtk_tree_model_get_flags       (GtkTreeModel *tree_model);

diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index 2ca0d20795afa6cf68a129fe2673a8b73b56862e..df13cf8c47fad6deff0ca95c2ce57a3f9cb9b693 100644 (file)
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -65,7 +65,7 @@ struct _GtkTreeModelFilterClass
 };
 
 /* base */
-GType         gtk_tree_model_filter_get_type                   (void);
+GType         gtk_tree_model_filter_get_type                   (void) G_GNUC_CONST;
 GtkTreeModel *gtk_tree_model_filter_new                        (GtkTreeModel                 *child_model,
                                                                 GtkTreePath                  *root);
 void          gtk_tree_model_filter_set_visible_func           (GtkTreeModelFilter           *filter,

diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 30b3541a020122e024390b493320347182ca01d3..462a0e731137653ac2b1f22e66ea246ba3b681bd 100644 (file)
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -71,7 +71,7 @@ struct _GtkTreeSelectionClass
 };
 
 
-GType            gtk_tree_selection_get_type            (void);
+GType            gtk_tree_selection_get_type            (void) G_GNUC_CONST;
 
 void             gtk_tree_selection_set_mode            (GtkTreeSelection            *selection,
                                                         GtkSelectionMode             type);

diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index ed6b50263ec1a19a9624fe9a96979afc55158c0f..aef4a89035ddc19f410a29fab8a30d1eed93f67d 100644 (file)
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -68,7 +68,7 @@ struct _GtkTreeStoreClass
 };
 
 
-GType         gtk_tree_store_get_type         (void);
+GType         gtk_tree_store_get_type         (void) G_GNUC_CONST;
 GtkTreeStore *gtk_tree_store_new              (gint          n_columns,
                                               ...);
 GtkTreeStore *gtk_tree_store_newv             (gint          n_columns,

diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 8d5c71f6be2280585e0827bcba11cee7e85d1443..69376b8663a4382fc77fe6c9d5ec0f403b2157bc 100644 (file)
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -130,7 +130,7 @@ typedef gboolean (*GtkTreeViewRowSeparatorFunc) (GtkTreeModel      *model,
 
 
 /* Creators */
-GType                  gtk_tree_view_get_type                      (void);
+GType                  gtk_tree_view_get_type                      (void) G_GNUC_CONST;
 GtkWidget             *gtk_tree_view_new                           (void);
 GtkWidget             *gtk_tree_view_new_with_model                (GtkTreeModel              *model);
 

diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index d623268d4857f36cf62c69d769c12b57477a0070..41132c060a2d364aeb989000a6fc66a340fcbfe1 100644 (file)
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -120,7 +120,7 @@ struct _GtkTreeViewColumnClass
   void (*_gtk_reserved4) (void);
 };
 
-GType                   gtk_tree_view_column_get_type            (void);
+GType                   gtk_tree_view_column_get_type            (void) G_GNUC_CONST;
 GtkTreeViewColumn      *gtk_tree_view_column_new                 (void);
 GtkTreeViewColumn      *gtk_tree_view_column_new_with_attributes (const gchar             *title,
                                                                  GtkCellRenderer         *cell,

diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index 13199c5a7e297d0654b27504bc3b33d993da4d2f..6701807176f3cf0e011839a946bdc4e0abd3f597 100644 (file)
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -98,7 +98,7 @@ typedef enum {
   GTK_UI_MANAGER_ACCELERATOR  = 1 << 8
 } GtkUIManagerItemType;
 
-GType          gtk_ui_manager_get_type            (void);
+GType          gtk_ui_manager_get_type            (void) G_GNUC_CONST;
 GtkUIManager  *gtk_ui_manager_new                 (void);
 void           gtk_ui_manager_set_add_tearoffs    (GtkUIManager          *self,
                                                   gboolean               add_tearoffs);

diff --git a/gtk/makegtkalias.pl b/gtk/makegtkalias.pl
index 43e17ced8bf0b97d854630931f892e03f8928318..b1b76d9560b2d8d7fc3b1845293a270bac36e22b 100755 (executable)
--- a/gtk/makegtkalias.pl
+++ b/gtk/makegtkalias.pl
@@ -103,13 +103,23 @@ while (<>) {
       next;
   }
  
-
+  chop;
   my $str = $_;
+  my @words;
+  my $attributes = "";
+
+  @words = split(/ /, $str);
+  $str = shift(@words);
   chomp($str);
   my $alias = "IA__".$str;
   
+  # Drop any Win32 specific .def file syntax,  but keep attributes
+  foreach $word (@words) {
+      $attributes = "$attributes $word" unless $word eq "PRIVATE";
+  }
+      
   print <<EOF
-extern __typeof ($str) $alias __attribute((visibility("hidden")));
+extern __typeof ($str) $alias __attribute((visibility("hidden")))$attributes;
 extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
 \#define $str $alias